The previous patch added help_unknown_ref to print a more helpful error 
message when trying to merge a branch that doesn't exist, by printing a 
list of remote branches the user might have meant. Use it.

Signed-off-by: Vikrant Varma <vikrant.varm...@gmail.com>
---
 builtin/merge.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/builtin/merge.c b/builtin/merge.c
index 3e2daa3..0f1f39b 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -1053,8 +1053,8 @@ static struct commit_list *collect_parents(struct commit 
*head_commit,
                remotes = &commit_list_insert(head_commit, remotes)->next;
        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]);
+               if (!commit) 
+                       help_unknown_ref(argv[i]);                      
                remotes = &commit_list_insert(commit, remotes)->next;
        }
        *remotes = NULL;
-- 
1.8.3-rc0

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to