summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-02-03 14:16:00 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-02-03 14:16:00 -0800
commitda94a08967155212a6948f01cd30f5e9b36191a8 (patch)
tree6699714bfee3ed237c8d21e05f419653a5a10bfb
parentMerge branch 'tg/ls-remote-symref' (diff)
parentcontrib/subtree: Make testing easier (diff)
downloadtgif-da94a08967155212a6948f01cd30f5e9b36191a8.tar.xz
Merge branch 'dg/subtree-test'
* dg/subtree-test: contrib/subtree: Make testing easier
-rw-r--r--contrib/subtree/Makefile6
1 files changed, 5 insertions, 1 deletions
diff --git a/contrib/subtree/Makefile b/contrib/subtree/Makefile
index 3071baf493..6afa9aafdf 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: