Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
builtin/branch.c | 3 +--
1 file changed, 1 insertion(+), 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);
--
1.8.4.2+fc1
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
