Skip to content

Commit 43cce5c

Browse files
greenedgitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 7548842 commit 43cce5c

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

contrib/subtree/Makefile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ GIT_SUBTREE_DOC := git-subtree.1
3737
GIT_SUBTREE_XML := git-subtree.xml
3838
GIT_SUBTREE_TXT := git-subtree.txt
3939
GIT_SUBTREE_HTML := git-subtree.html
40+
GIT_SUBTREE_TEST := ../../git-subtree
4041

4142
all:: $(GIT_SUBTREE)
4243

@@ -71,7 +72,10 @@ $(GIT_SUBTREE_HTML): $(GIT_SUBTREE_TXT)
7172
$(ASCIIDOC) -b xhtml11 -d manpage -f $(ASCIIDOC_CONF) \
7273
-agit_version=$(GIT_VERSION) $^
7374

74-
test:
75+
$(GIT_SUBTREE_TEST): $(GIT_SUBTREE)
76+
cp $< $@
77+
78+
test: $(GIT_SUBTREE_TEST)
7579
$(MAKE) -C t/ test
7680

7781
clean:

0 commit comments

Comments
 (0)