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 <rgarciasuarez@gmail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Rafael Garcia-Suarez committed
Sep 29, 2008 at 18:04 UTC
cbce6c0be30cbaf8c39051f85006d679338a8ddc
1 file changed
+1
-1
builtin-commit.c
+1
-1
@@ -639,7 +639,7 @@ static int prepare_to_commit(const char *index_file, const char *prefix)
639
active_cache_tree = cache_tree();
640
if (cache_tree_update(active_cache_tree,
641
active_cache, active_nr, 0, 0) < 0) {
642
- error("Error building trees");
642
+ error("Error building trees; the index is unmerged?");
643
return 0;
644
}
645