diff options
| author |  Vikrant Varma <vikrant.varma94@gmail.com> | 2013-05-04 05:34:20 +0530 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2013-05-08 15:34:33 -0700 |
| commit | f3f8af0e54a31ffed242dc36482f82393f596ee5 (patch) | |
| tree | 699c87d896204edf74e27673c660e67adee798e4 | |
| parent | help: add help_unknown_ref() (diff) | |
| download | tgif-f3f8af0e54a31ffed242dc36482f82393f596ee5.tar.xz | |
merge: use help_unknown_ref()
Use help.c:help_unknown_ref() instead of die() to provide a
friendlier error message before exiting, when one of the refs
specified in a merge is unknown.
Signed-off-by: Vikrant Varma <vikrant.varma94@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin/merge.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index 3e2daa37c3..2ebe732896 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -1054,7 +1054,8 @@ static struct commit_list *collect_parents(struct commit *head_commit, for (i = 0; i < argc; i++) { struct commit *commit = get_merge_parent(argv[i]); if (!commit) - die(_("%s - not something we can merge"), argv[i]); + help_unknown_ref(argv[i], "merge", + "not something we can merge"); remotes = &commit_list_insert(commit, remotes)->next; } *remotes = NULL; |