kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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 <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Felipe Contreras 2013-04-30 16:49:11 -05:00 committed by Junio C Hamano
parent cdfd94837b
commit 1f27e7d56b
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sha1_name.c
View File

@ -1033,12 +1033,14 @@ int interpret_branch_name(const char *name, struct strbuf *buf)
int len = interpret_nth_prior_checkout(name, buf); int len = interpret_nth_prior_checkout(name, buf);
int tmp_len; int tmp_len;


if (!len) if (!len) {
return len; /* syntax Ok, not enough switches */ return len; /* syntax Ok, not enough switches */
if (0 < len && len == namelen) } else if (len > 0) {
if (len == namelen)
return len; /* consumed all */ return len; /* consumed all */
else if (0 < len) else
return reinterpret(name, namelen, len, buf); return reinterpret(name, namelen, len, buf);
}


cp = strchr(name, '@'); cp = strchr(name, '@');
if (!cp) if (!cp)