aboutsummaryrefslogtreecommitdiff
path: root/archive.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-02-10 21:31:19 -0800
committerJunio C Hamano <gitster@pobox.com>2009-02-10 21:31:19 -0800
commitf1c8a48a2de69bfc9837c53f2c52ffbe7239dc3e (patch)
treedbf5e4b02e89a51e9bd00cea133c105a51e86302 /archive.c
parent8c5514906a532f154aa0db1199f46bbdeeffb0ad (diff)
parentd3bee161fef7820e83b44b899c531228a5546e87 (diff)
downloadgit-f1c8a48a2de69bfc9837c53f2c52ffbe7239dc3e.tar.xz
Merge branch 'lh/submodule-tree-traversal' (early part)
* 'lh/submodule-tree-traversal' (early part): tree.c: allow read_tree_recursive() to traverse gitlink entries
Diffstat (limited to 'archive.c')
-rw-r--r--archive.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/archive.c b/archive.c
index 9ac455d889..e6de0397cc 100644
--- a/archive.c
+++ b/archive.c
@@ -132,7 +132,7 @@ static int write_archive_entry(const unsigned char *sha1, const char *base,
err = write_entry(args, sha1, path.buf, path.len, mode, NULL, 0);
if (err)
return err;
- return READ_TREE_RECURSIVE;
+ return (S_ISDIR(mode) ? READ_TREE_RECURSIVE : 0);
}
buffer = sha1_file_to_archive(path_without_prefix, sha1, mode,