From: Shawn O. Pearce <spearce@spearce.org>
Date: Tue, 25 Sep 2007 04:13:19 +0000 (-0400)
Subject: Cleanup unnecessary break in remote.c
X-Git-Tag: v1.5.4-rc0~292^2~31
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7dfee372b08f653c2709c90bea986e4ed608f410;p=git.git

Cleanup unnecessary break in remote.c

This simple change makes the body of "case 0" easier to read; no
matter what the value of matched_src is we want to break out of
the switch and not fall through.  We only want to display an error
if matched_src is NULL, as this indicates there is no local branch
matching the input.

Also modified the default case's error message so it uses one less
line of text.  Even at 8 column per tab indentation we still don't
break 80 columns with this new formatting.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/remote.c b/remote.c
index ac354f379..2166a2bf1 100644
--- a/remote.c
+++ b/remote.c
@@ -598,15 +598,12 @@ static int match_explicit(struct ref *src, struct ref *dst,
 		 * way to delete 'other' ref at the remote end.
 		 */
 		matched_src = try_explicit_object_name(rs->src);
-		if (matched_src)
-			break;
-		error("src refspec %s does not match any.",
-		      rs->src);
+		if (!matched_src)
+			error("src refspec %s does not match any.", rs->src);
 		break;
 	default:
 		matched_src = NULL;
-		error("src refspec %s matches more than one.",
-		      rs->src);
+		error("src refspec %s matches more than one.", rs->src);
 		break;
 	}