summaryrefslogtreecommitdiff
path: root/builtin-ls-remote.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-03-04 00:34:39 -0800
committerJunio C Hamano <gitster@pobox.com>2008-03-04 00:34:39 -0800
commit27b4070e40a771c41ed581ef1ac98dd43e58ab87 (patch)
tree084c3b9f77e5d9e8253a16e6f9baea5d25f77e46 /builtin-ls-remote.c
parent4947cf9cc377b15006f3e649c59edf9bc813af6f (diff)
parent52dce39762fbec75b2d561e5dedb25b8e51f83eb (diff)
downloadgit-27b4070e40a771c41ed581ef1ac98dd43e58ab87.tar.gz
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()
Diffstat (limited to 'builtin-ls-remote.c')
-rw-r--r--builtin-ls-remote.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/builtin-ls-remote.c b/builtin-ls-remote.c
index 023754986e..8907a89d6c 100644
--- a/builtin-ls-remote.c
+++ b/builtin-ls-remote.c
@@ -94,11 +94,8 @@ int cmd_ls_remote(int argc, const char **argv, const char *prefix)
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;