diff options
author | Junio C Hamano <gitster@pobox.com> | 2007-06-26 18:33:24 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2007-06-26 18:45:29 -0700 |
commit | 68fb4650497d6acbf6d407513cd2e2d960442e3b (patch) | |
tree | 0c41cacd974ae9847dfcee977822f12e6d248baf /fetch.c | |
parent | b658d50325c938d87d4891cb62e2eefb0b58a62c (diff) | |
parent | b69ba460bb0710b2af8a20b4b0d62233f29401ec (diff) | |
download | git-68fb4650497d6acbf6d407513cd2e2d960442e3b.tar.gz |
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.c | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -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) |