Andrew's git / gitweb.git / diff
?
Sync with 1.7.2.1
authorJunio C Hamano <gitster@pobox.com>
Tue, 27 Jul 2010 23:54:06 +0000 (16:54 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 27 Jul 2010 23:55:05 +0000 (16:55 -0700)
Signed-off-by: Junio C Hamano <gitster@pobox.com>
GIT-VERSION-GEN patch | blob | history
t/.gitignore patch | blob | history
t/Makefile patch | blob | history
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 8228e883e6c5aba64ee4aa691b624b451f0b3946..f6d301a10f7b57edb623de8d5a78c90f4fbc71a7 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v1.7.2.1
+DEF_VER=v1.7.2.GIT
 
 LF='
 '
diff --git a/t/.gitignore b/t/.gitignore
index 7dcbb232cd876cb7b976443cc586f60a94ab92bf..4e731dc1e3bef53903f030ee7c63fe7ef7324cb1 100644 (file)
--- a/t/.gitignore
+++ b/t/.gitignore
@@ -1,2 +1,3 @@
 /trash directory*
 /test-results
+/.prove
diff --git a/t/Makefile b/t/Makefile
index cf5f9e2e1eb17c442220464d06374e6c529f8629..819b936870300fc8325c0f24f8c68ea8bdaa2727 100644 (file)
--- a/t/Makefile
+++ b/t/Makefile
@@ -30,6 +30,7 @@ clean:
        $(RM) -r 'trash directory'.* test-results
        $(RM) t????/cvsroot/CVSROOT/?*
        $(RM) -r valgrind/bin
+       $(RM) .prove
 
 aggregate-results-and-cleanup: $(T)
        $(MAKE) aggregate-results