summaryrefslogtreecommitdiffstats
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-01-07 21:32:48 -0800
committerJunio C Hamano <junkio@cox.net>2006-01-07 21:32:48 -0800
commit8fc11b5aa98540f7caab87e22e5aae63512893a2 (patch)
tree42cc20556d8b4766d9a0adbcc2e32de22b9fc6c9 /t
parentGIT 1.0.7 (diff)
parentmailsplit: allow empty input from stdin (diff)
downloadgit-1.0.8.tar.gz
git-1.0.8.zip
GIT 1.0.8v1.0.8
Diffstat (limited to '')
-rwxr-xr-xt/t2001-checkout-cache-clash.sh2
-rw-r--r--tag.c2
-rw-r--r--tar-tree.c2
-rw-r--r--tree.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/t/t2001-checkout-cache-clash.sh b/t/t2001-checkout-cache-clash.sh
index b1c5263a91..0dcab8f1de 100755
--- a/t/t2001-checkout-cache-clash.sh
+++ b/t/t2001-checkout-cache-clash.sh
@@ -74,7 +74,7 @@ test_debug 'show_files $tree3'
test_expect_success \
'read previously written tree and checkout.' \
'git-read-tree $tree2 && git-checkout-index -f -a'
-test_debug show_files $tree2
+test_debug 'show_files $tree2'
test_expect_success \
'checking out conflicting path with -f' \
diff --git a/tag.c b/tag.c
index 61ac434d6b..ac0e57398a 100644
--- a/tag.c
+++ b/tag.c
@@ -1,5 +1,5 @@
-#include "tag.h"
#include "cache.h"
+#include "tag.h"
const char *tag_type = "tag";
diff --git a/tar-tree.c b/tar-tree.c
index 96bd1438d9..f749d4b869 100644
--- a/tar-tree.c
+++ b/tar-tree.c
@@ -433,7 +433,7 @@ int main(int argc, char **argv)
archive_time = time(NULL);
if (basedir)
write_header((unsigned char *)"0", TYPEFLAG_DIR, NULL, NULL,
- basedir, 040755, NULL, 0);
+ basedir, 040777, NULL, 0);
traverse_tree(buffer, size, NULL);
free(buffer);
write_trailer();
diff --git a/tree.c b/tree.c
index e7a7b7190c..dc1c41e938 100644
--- a/tree.c
+++ b/tree.c
@@ -1,8 +1,8 @@
+#include "cache.h"
#include "tree.h"
#include "blob.h"
#include "commit.h"
#include "tag.h"
-#include "cache.h"
#include <stdlib.h>
const char *tree_type = "tree";