summaryrefslogtreecommitdiff
path: root/fetch.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-06-27 01:33:24 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-06-27 01:45:29 (GMT)
commit68fb4650497d6acbf6d407513cd2e2d960442e3b (patch)
tree0c41cacd974ae9847dfcee977822f12e6d248baf /fetch.c
parentb658d50325c938d87d4891cb62e2eefb0b58a62c (diff)
parentb69ba460bb0710b2af8a20b4b0d62233f29401ec (diff)
downloadgit-68fb4650497d6acbf6d407513cd2e2d960442e3b.zip
git-68fb4650497d6acbf6d407513cd2e2d960442e3b.tar.gz
git-68fb4650497d6acbf6d407513cd2e2d960442e3b.tar.bz2
Merge branch 'maint'
* maint: config: Change output of --get-regexp for valueless keys config: Complete documentation of --get-regexp cleanup merge-base test script Fix zero-object version-2 packs Ignore submodule commits when fetching over dumb protocols
Diffstat (limited to 'fetch.c')
-rw-r--r--fetch.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/fetch.c b/fetch.c
index dda33e5..811be87 100644
--- a/fetch.c
+++ b/fetch.c
@@ -46,6 +46,9 @@ static int process_tree(struct tree *tree)
while (tree_entry(&desc, &entry)) {
struct object *obj = NULL;
+ /* submodule commits are not stored in the superproject */
+ if (S_ISGITLINK(entry.mode))
+ continue;
if (S_ISDIR(entry.mode)) {
struct tree *tree = lookup_tree(entry.sha1);
if (tree)