From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 4 Mar 2008 08:34:39 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.5-rc0~66
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=27b4070e40a771c41ed581ef1ac98dd43e58ab87;p=git.git

Merge branch 'maint'

* maint:
  Fix 'git remote show' regression on empty repository in 1.5.4
  Fix incorrect wording in git-merge.txt.
  git-merge.sh: better handling of combined --squash,--no-ff,--no-commit options
  Fix random crashes in http_cleanup()
---

27b4070e40a771c41ed581ef1ac98dd43e58ab87
diff --cc builtin-ls-remote.c
index 023754986,720280e39..8907a89d6
--- a/builtin-ls-remote.c
+++ b/builtin-ls-remote.c
@@@ -94,11 -94,6 +94,8 @@@ int cmd_ls_remote(int argc, const char 
  		transport_set_option(transport, TRANS_OPT_UPLOADPACK, uploadpack);
  
  	ref = transport_get_remote_refs(transport);
- 	transport_disconnect(transport);
- 
- 	if (!ref)
++	if (transport_disconnect(transport))
 +		return 1;
- 
  	for ( ; ref; ref = ref->next) {
  		if (!check_ref_type(ref, flags))
  			continue;