Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
branch: trivial style fix
author
Felipe Contreras
<felipe.contreras@gmail.com>
Thu, 31 Oct 2013 09:25:38 +0000
(
03:25
-0600)
committer
Junio C Hamano
<gitster@pobox.com>
Thu, 31 Oct 2013 20:46:55 +0000
(13:46 -0700)
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/branch.c
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
19ecb56
)
diff --git
a/builtin/branch.c
b/builtin/branch.c
index ad0f86de540dc394199f71c03665d0cd76371c35..5696cf0ef79cd8242e0a384a058d5bd565ec5be3 100644
(file)
--- 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);