merge-recursive: Small code clarification -- variable name and comments

diff --git a/t/Makefile b/t/Makefile
index d8bf05ff6bfc79a7f05b620de0fa15ea932ad49b..c7baefb7eac27fff31e3e78c7862eb2bf73d9068 100644 (file)
--- a/t/Makefile
+++ b/t/Makefile
@@ -8,6 +8,7 @@
 
 #GIT_TEST_OPTS=--verbose --debug
 SHELL_PATH ?= $(SHELL)
+PERL_PATH ?= /usr/bin/perl
 TAR ?= $(TAR)
 RM ?= rm -f
 
@@ -28,7 +29,6 @@ pre-clean:
 
 clean:
        $(RM) -r 'trash directory'.* test-results
-       $(RM) t????/cvsroot/CVSROOT/?*
        $(RM) -r valgrind/bin
        $(RM) .prove
 
@@ -50,7 +50,6 @@ valgrind:
        GIT_TEST_OPTS=--valgrind $(MAKE)
 
 # Smoke testing targets
--include ../GIT-BUILD-OPTIONS
 -include ../GIT-VERSION-FILE
 uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo unknown')
 uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo unknown')
@@ -58,7 +57,7 @@ uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo unknown')
 test-results:
        mkdir -p test-results
 
-test-results/git-smoke.tar.gz:
+test-results/git-smoke.tar.gz: test-results
        $(PERL_PATH) ./harness \
                --archive="test-results/git-smoke.tar.gz" \
                $(T)
@@ -69,6 +68,12 @@ SMOKE_UPLOAD_FLAGS =
 ifdef SMOKE_USERNAME
        SMOKE_UPLOAD_FLAGS += -F username="$(SMOKE_USERNAME)" -F password="$(SMOKE_PASSWORD)"
 endif
+ifdef SMOKE_COMMENT
+       SMOKE_UPLOAD_FLAGS += -F comments="$(SMOKE_COMMENT)"
+endif
+ifdef SMOKE_TAGS
+       SMOKE_UPLOAD_FLAGS += -F tags="$(SMOKE_TAGS)"
+endif
 
 smoke_report: smoke
        curl \