summaryrefslogtreecommitdiff
path: root/transport.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-05-30 07:09:41 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-05-30 07:09:41 (GMT)
commit5b42477b59886a85d4b49a60313f9b9d4a0d576f (patch)
tree55e42d432085f0afec9a5bc9f4251adcf1dcbfa5 /transport.c
parenta059240f06967f485e0a094e220bae73a746ed24 (diff)
parentb1905aeac5aded421cd90f8d264e27bb39672b36 (diff)
downloadgit-5b42477b59886a85d4b49a60313f9b9d4a0d576f.zip
git-5b42477b59886a85d4b49a60313f9b9d4a0d576f.tar.gz
git-5b42477b59886a85d4b49a60313f9b9d4a0d576f.tar.bz2
Merge branch 'jm/maint-misc-fix' into maint
* jm/maint-misc-fix: read_gitfile_gently: use ssize_t to hold read result remove tests of always-false condition rerere.c: diagnose a corrupt MERGE_RR when hitting EOF between TAB and '\0'
Diffstat (limited to 'transport.c')
-rw-r--r--transport.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/transport.c b/transport.c
index a02f79a..69dae71 100644
--- a/transport.c
+++ b/transport.c
@@ -156,7 +156,7 @@ static void set_upstreams(struct transport *transport, struct ref *refs,
continue;
if (!ref->peer_ref)
continue;
- if (!ref->new_sha1 || is_null_sha1(ref->new_sha1))
+ if (is_null_sha1(ref->new_sha1))
continue;
/* Follow symbolic refs (mainly for HEAD). */