Merge git://github.com/git-l10n/git-po

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);