Skip to content

Commit

Permalink
branch: trivial style fix
Browse files Browse the repository at this point in the history
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Felipe Contreras authored and Junio C Hamano committed Oct 31, 2013
1 parent 19ecb56 commit 54d07f2
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions builtin/branch.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 54d07f2

Please sign in to comment.