From 54d07f2e25eb90f00def6d6406714d787ab0beb9 Mon Sep 17 00:00:00 2001 From: Felipe Contreras Date: Thu, 31 Oct 2013 03:25:38 -0600 Subject: branch: trivial style fix Signed-off-by: Felipe Contreras Signed-off-by: Junio C Hamano --- builtin/branch.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'builtin/branch.c') diff --git a/builtin/branch.c b/builtin/branch.c index ad0f86de5..5696cf0ef 100644 --- 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); -- cgit v1.2.1