Browse Source

remove tests of always-false condition

* fsck.c (fsck_error_function): Don't test obj->sha1 == 0.
It can never be true, since that sha1 member is an array.
* transport.c (set_upstreams): Likewise for ref->new_sha1.

Signed-off-by: Jim Meyering <meyering@redhat.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Jim Meyering 14 years ago committed by Junio C Hamano
parent
commit
5dd564895e
  1. 2
      fsck.c
  2. 2
      transport.c

2
fsck.c

@ -350,7 +350,7 @@ int fsck_error_function(struct object *obj, int type, const char *fmt, ...)
int len; int len;
struct strbuf sb = STRBUF_INIT; struct strbuf sb = STRBUF_INIT;


strbuf_addf(&sb, "object %s:", obj->sha1?sha1_to_hex(obj->sha1):"(null)"); strbuf_addf(&sb, "object %s:", sha1_to_hex(obj->sha1));


va_start(ap, fmt); va_start(ap, fmt);
len = vsnprintf(sb.buf + sb.len, strbuf_avail(&sb), fmt, ap); len = vsnprintf(sb.buf + sb.len, strbuf_avail(&sb), fmt, ap);

2
transport.c

@ -156,7 +156,7 @@ static void set_upstreams(struct transport *transport, struct ref *refs,
continue; continue;
if (!ref->peer_ref) if (!ref->peer_ref)
continue; continue;
if (!ref->new_sha1 || is_null_sha1(ref->new_sha1)) if (is_null_sha1(ref->new_sha1))
continue; continue;


/* Follow symbolic refs (mainly for HEAD). */ /* Follow symbolic refs (mainly for HEAD). */

Loading…
Cancel
Save