From cbce6c0be30cbaf8c39051f85006d679338a8ddc Mon Sep 17 00:00:00 2001 From: Rafael Garcia-Suarez Date: Mon, 29 Sep 2008 18:04:41 +0200 Subject: [PATCH] Clarify commit error message for unmerged files Currently, trying to use git-commit with unmerged files in the index will show the message "Error building trees", which can be a bit obscure to the end user. This patch makes the error message clearer, and consistent with what git-write-tree reports in a similar situation. Signed-off-by: Rafael Garcia-Suarez Signed-off-by: Shawn O. Pearce --- builtin-commit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin-commit.c b/builtin-commit.c index c870037b07..e2a7e48b1c 100644 --- a/builtin-commit.c +++ b/builtin-commit.c @@ -639,7 +639,7 @@ static int prepare_to_commit(const char *index_file, const char *prefix) active_cache_tree = cache_tree(); if (cache_tree_update(active_cache_tree, active_cache, active_nr, 0, 0) < 0) { - error("Error building trees"); + error("Error building trees; the index is unmerged?"); return 0; } -- 2.47.1