branch: trivial style fix

felipec · gitster · commit 54d07f2e25eb · 2013-10-31T13:46:55.000-07:00
Signed-off-by: Felipe Contreras &lt;felipe.contreras@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/builtin/branch.c b/builtin/branch.c
@@ -975,9 +975,8 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
 			die(_("no such branch '%s'"), argv[0]);
 		}
 
-		if (!branch_has_merge_config(branch)) {
+		if (!branch_has_merge_config(branch))
 			die(_("Branch '%s' has no upstream information"), branch->name);
-		}
 
 		strbuf_addf(&buf, "branch.%s.remote", branch->name);
 		git_config_set_multivar(buf.buf, NULL, NULL, 1);

Original file line number	Diff line number	Diff line change
`@@ -975,9 +975,8 @@ int cmd_branch(int argc, const char *argv, const char prefix)`
`975`	`975`	`die(_("no such branch '%s'"), argv[0]);`
`976`	`976`	`}`
`977`	`977`
`978`		`- if (!branch_has_merge_config(branch)) {`
	`978`	`+ if (!branch_has_merge_config(branch))`
`979`	`979`	`die(_("Branch '%s' has no upstream information"), branch->name);`
`980`		`- }`
`981`	`980`
`982`	`981`	`strbuf_addf(&buf, "branch.%s.remote", branch->name);`
`983`	`982`	`git_config_set_multivar(buf.buf, NULL, NULL, 1);`