From: David A. Greene <greened@obbligato.org>
Date: Sun, 17 Jan 2016 23:47:59 +0000 (-0600)
Subject: contrib/subtree: Make testing easier
X-Git-Tag: v2.8.0-rc0~81^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=43cce5c8ed48ab955b3347f999cda7c1c33dde0a;p=git-core%2Fgit.git

contrib/subtree: Make testing easier

Add some Makefile dependencies to ensure an updated git-subtree
gets copied to the main area before testing begins.

Signed-off-by: David A. Greene <greened@obbligato.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/contrib/subtree/Makefile b/contrib/subtree/Makefile
index 3071baf49..6afa9aafd 100644
--- a/contrib/subtree/Makefile
+++ b/contrib/subtree/Makefile
@@ -37,6 +37,7 @@ GIT_SUBTREE_DOC := git-subtree.1
 GIT_SUBTREE_XML := git-subtree.xml
 GIT_SUBTREE_TXT := git-subtree.txt
 GIT_SUBTREE_HTML := git-subtree.html
+GIT_SUBTREE_TEST := ../../git-subtree
 
 all:: $(GIT_SUBTREE)
 
@@ -71,7 +72,10 @@ $(GIT_SUBTREE_HTML): $(GIT_SUBTREE_TXT)
 	$(ASCIIDOC) -b xhtml11 -d manpage -f $(ASCIIDOC_CONF) \
 		-agit_version=$(GIT_VERSION) $^
 
-test:
+$(GIT_SUBTREE_TEST): $(GIT_SUBTREE)
+	cp $< $@
+
+test: $(GIT_SUBTREE_TEST)
 	$(MAKE) -C t/ test
 
 clean: