X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=fetch.c;h=811be87a3c1e0d14d9f2b37650d56575b49caa22;hb=f18b1c55e5b7478524c15685cd643555fc919f3f;hp=8e29d313f817981a29ebb65f2f579c9f1bd8e9b6;hpb=27be481ffbbde9499b4203d26680cf21b4a7ec29;p=git.git

diff --git a/fetch.c b/fetch.c
index 8e29d313f..811be87a3 100644
--- a/fetch.c
+++ b/fetch.c
@@ -15,7 +15,7 @@ int get_verbosely = 0;
 int get_recover = 0;
 static unsigned char current_commit_sha1[20];
 
-void pull_say(const char *fmt, const char *hex) 
+void pull_say(const char *fmt, const char *hex)
 {
 	if (get_verbosely)
 		fprintf(stderr, fmt, hex);
@@ -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)
@@ -153,7 +156,7 @@ static int process(struct object *obj)
 			return 0;
 		prefetch(obj->sha1);
 	}
-		
+
 	object_list_insert(obj, process_queue_end);
 	process_queue_end = &(*process_queue_end)->next;
 	return 0;