diff options
| author |  David A. Greene <greened@obbligato.org> | 2016-01-17 17:47:59 -0600 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2016-01-19 10:15:20 -0800 |
| commit | 43cce5c8ed48ab955b3347f999cda7c1c33dde0a (patch) | |
| tree | 09877bd8d8c0b275b7498d6a2920759826504c30 | |
| parent | Git 2.7 (diff) | |
| download | tgif-43cce5c8ed48ab955b3347f999cda7c1c33dde0a.tar.xz | |
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>
| -rw-r--r-- | contrib/subtree/Makefile | 6 |
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: |