From: Felipe Contreras Date: Tue, 30 Apr 2013 21:49:11 +0000 (-0500) Subject: sha1_name: compare variable with constant, not constant with variable X-Git-Tag: v1.8.4-rc0~180^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1f27e7d56b65fdc232a5a2a4de2ee97ff5eb176b;p=thirdparty%2Fgit.git sha1_name: compare variable with constant, not constant with variable And restructure the if/else to factor out the common "is len positive?" test into a single conditional. Signed-off-by: Felipe Contreras Signed-off-by: Junio C Hamano --- diff --git a/sha1_name.c b/sha1_name.c index 4428df19a7..5a58720d85 100644 --- a/sha1_name.c +++ b/sha1_name.c @@ -1033,12 +1033,14 @@ int interpret_branch_name(const char *name, struct strbuf *buf) int len = interpret_nth_prior_checkout(name, buf); int tmp_len; - if (!len) + if (!len) { return len; /* syntax Ok, not enough switches */ - if (0 < len && len == namelen) - return len; /* consumed all */ - else if (0 < len) - return reinterpret(name, namelen, len, buf); + } else if (len > 0) { + if (len == namelen) + return len; /* consumed all */ + else + return reinterpret(name, namelen, len, buf); + } cp = strchr(name, '@'); if (!cp)