diff options
Diffstat (limited to '')
| -rwxr-xr-x | t/t2001-checkout-cache-clash.sh | 2 | ||||
| -rw-r--r-- | tag.c | 2 | ||||
| -rw-r--r-- | tar-tree.c | 2 | ||||
| -rw-r--r-- | tree.c | 2 |
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' \ @@ -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(); @@ -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"; |