summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelipe Contreras <felipe.contreras@gmail.com>2013-10-31 09:25:38 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-10-31 20:46:55 (GMT)
commit54d07f2e25eb90f00def6d6406714d787ab0beb9 (patch)
tree070d9d98339ca352c06e7bd3a5d71b00f1b73a58
parent19ecb564ad15d6eb0544d11d808ca8dc9a198bdf (diff)
downloadgit-54d07f2e25eb90f00def6d6406714d787ab0beb9.zip
git-54d07f2e25eb90f00def6d6406714d787ab0beb9.tar.gz
git-54d07f2e25eb90f00def6d6406714d787ab0beb9.tar.bz2
branch: trivial style fix
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--builtin/branch.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/builtin/branch.c b/builtin/branch.c
index ad0f86d..5696cf0 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);