From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 27 Jun 2007 01:33:24 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.3-rc0~55
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=68fb4650497d6acbf6d407513cd2e2d960442e3b;p=git.git

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
---

68fb4650497d6acbf6d407513cd2e2d960442e3b
diff --cc fetch.c
index dda33e548,6f1f420be..811be87a3
--- a/fetch.c
+++ b/fetch.c
@@@ -46,6 -46,9 +46,9 @@@ static int process_tree(struct tree *tr
  	while (tree_entry(&desc, &entry)) {
  		struct object *obj = NULL;
  
+ 		/* submodule commits are not stored in the superproject */
 -		if (S_ISDIRLNK(entry.mode))
++		if (S_ISGITLINK(entry.mode))
+ 			continue;
  		if (S_ISDIR(entry.mode)) {
  			struct tree *tree = lookup_tree(entry.sha1);
  			if (tree)