From ac8522a1ad8022462a04fb5504179469db6efb4f Mon Sep 17 00:00:00 2001
From: Achim Gratz <Stromeko@Stromeko.DE>
Date: Sat, 9 Feb 2013 08:31:44 +0100
Subject: [PATCH] Remove additions from contrib/ before moving HEAD

* mk/targets.mk (up0): Explicitly remove additions from contrib/
  before moving HEAD via git since the files might be renamed, deleted
  or moved by checking out a new version.

Thanks to Suvayu Ali for pointing to this problem.  The user still has
to remember to do this when moving HEAD manually, though.
---
 mk/targets.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mk/targets.mk b/mk/targets.mk
index 4a9ee60cd..aef11eb14 100644
--- a/mk/targets.mk
+++ b/mk/targets.mk
@@ -102,6 +102,7 @@ ifeq ($(TEST_NO_AUTOCLEAN),) # define this variable to leave $(testdir) around f
 	$(MAKE) cleantest
 endif
 
+up0::	cleanaddcontrib
 up0 up1 up2::
 	git remote update
 	git pull