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>
Vikrant Varma committed
May 4, 2013 at 05:34 UTC
f3f8af0e54a31ffed242dc36482f82393f596ee5
1 file changed
+2
-1
builtin/merge.c
+2
-1
@@ -1054,7 +1054,8 @@ static struct commit_list *collect_parents(struct commit *head_commit,
1054
for (i = 0; i < argc; i++) {
1055
struct commit *commit = get_merge_parent(argv[i]);
1056
if (!commit)
1057
- die(_("%s - not something we can merge"), argv[i]);
1057
+ help_unknown_ref(argv[i], "merge",
1058
+ "not something we can merge");
1059
remotes = &commit_list_insert(commit, remotes)->next;
1060
}
1061
*remotes = NULL;