Skip to content

Commit

Permalink
Merge branch 'dg/subtree-test'
Browse files Browse the repository at this point in the history
* dg/subtree-test:
  contrib/subtree: Make testing easier
  • Loading branch information
Junio C Hamano committed Feb 3, 2016
2 parents bd6934a + 43cce5c commit da94a08
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion contrib/subtree/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down Expand Up @@ -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:
Expand Down

0 comments on commit da94a08

Please sign in to comment.