Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Tue, 4 Mar 2008 08:34:39 +0000 (00:34 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 4 Mar 2008 08:34:39 +0000 (00:34 -0800)
* 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()

1  2 
builtin-ls-remote.c
http.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;
diff --cc http.c
Simple merge