Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
t6022: Add testcase for merging a renamed file with a simple change
[gitweb.git]
/
transport.c
diff --git
a/transport.c
b/transport.c
index a02f79aae3d91ea4109d21a9ed9ca2d962125375..69dae711037ea7a54d86910932d74ac2b24b57fd 100644
(file)
--- 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). */