summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchim Gratz <Stromeko@Stromeko.DE>2013-02-09 08:31:44 +0100
committerAchim Gratz <Stromeko@Stromeko.DE>2013-02-09 08:31:44 +0100
commitac8522a1ad8022462a04fb5504179469db6efb4f (patch)
tree78444510389c42a28f6608556cccb0e1a38c8771
parentfa55168d262cd2fbcf35d40474a7466502ea7836 (diff)
downloadorg-mode-ac8522a1ad8022462a04fb5504179469db6efb4f.tar.gz
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.
-rw-r--r--mk/targets.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/mk/targets.mk b/mk/targets.mk
index 4a9ee60..aef11eb 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