From: Vikrant Varma <vikrant.varma94@gmail.com>
Date: Sat, 4 May 2013 00:04:20 +0000 (+0530)
Subject: merge: use help_unknown_ref()
X-Git-Tag: v1.8.3.3~15^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f3f8af0e54a31ffed242dc36482f82393f596ee5;p=thirdparty%2Fgit.git

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>
---

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;