[PATCH v2 2/2] merge: use help_unknown_ref
- From
Vikrant Varma <vikrant.varma94@gmail.com>
- Date
- May 4, 2013, 00:04 UTC
- Message-ID
- <1367625860-20746-3-git-send-email-vikrant.varma94@gmail.com>
- In-Reply-To
- <1367625860-20746-1-git-send-email-vikrant.varma94@gmail.com>
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> --- builtin/merge.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/builtin/merge.c b/builtin/merge.c index 3e2daa3..2ebe732 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;
-- 1.7.10.4