summaryrefslogtreecommitdiff
path: root/transport.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-05-30 00:09:55 -0700
committerJunio C Hamano <gitster@pobox.com>2011-05-30 00:09:55 -0700
commitfb674d767180354d9ad3e69f1d41bee98df6bfe9 (patch)
treecc96e4d45a06efacd978939e898713f9ede9db0b /transport.c
parentbe653d6cb87d17c1d70d31cb7cfcb004d48def7b (diff)
parent5b42477b59886a85d4b49a60313f9b9d4a0d576f (diff)
downloadgit-fb674d767180354d9ad3e69f1d41bee98df6bfe9.tar.gz
Merge branch 'maint'
* maint: git-submodule.sh: separate parens by a space to avoid confusing some shells Documentation/technical/api-diff.txt: correct name of diff_unmerge() 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 1a3998ee51..c9c8056f9d 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). */