summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Meyering <jim@meyering.net>2011-05-26 13:58:16 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-05-26 18:24:24 (GMT)
commit5dd564895e84eacfc728183fb5a9215665ff59a3 (patch)
tree8909749079c959c79a054a2d9c3e8368924158a6
parent5743350f696745a48dfe7976c98dc8eb5c842d72 (diff)
downloadgit-5dd564895e84eacfc728183fb5a9215665ff59a3.zip
git-5dd564895e84eacfc728183fb5a9215665ff59a3.tar.gz
git-5dd564895e84eacfc728183fb5a9215665ff59a3.tar.bz2
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>
-rw-r--r--fsck.c2
-rw-r--r--transport.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/fsck.c b/fsck.c
index 3d05d4a..c17a538 100644
--- a/fsck.c
+++ b/fsck.c
@@ -350,7 +350,7 @@ int fsck_error_function(struct object *obj, int type, const char *fmt, ...)
int len;
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);
len = vsnprintf(sb.buf + sb.len, strbuf_avail(&sb), fmt, ap);
diff --git a/transport.c b/transport.c
index 0078660..26d4e52 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). */