diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-11-06 14:34:43 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-11-06 14:34:43 -0800 |
| commit | 152a9c17a802379a3a48e025b74dedd76e2623cc (patch) | |
| tree | 35adf01f3da51119a475392076d1cb290b800a00 /builtin/branch.c | |
| parent | f26f72de159d7ade2fbe8b48734ce98c1aba4d72 (diff) | |
| parent | abf03eeb8e99538cd31806d5f252214b9fe695a6 (diff) | |
| download | git-152a9c17a802379a3a48e025b74dedd76e2623cc.tar.gz | |
Merge branch 'fc/trivial'
A random collection of style fixes and minor doc updates.
* fc/trivial:
setup: trivial style fixes
run-command: trivial style fixes
diff: trivial style fix
revision: trivial style fixes
pretty: trivial style fix
describe: trivial style fixes
transport-helper: trivial style fix
sha1-name: trivial style cleanup
branch: trivial style fix
revision: add missing include
doc/pull: clarify the illustrations
t: replace pulls with merges
merge: simplify ff-only option
Diffstat (limited to 'builtin/branch.c')
| -rw-r--r-- | builtin/branch.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/builtin/branch.c b/builtin/branch.c index ad0f86de54..5696cf0ef7 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); |