Clarify commit error message for unmerged files

rgs · spearce · commit cbce6c0be30c · 2008-09-29T09:13:20.000-07:00
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 &lt;rgarciasuarez@gmail.com&gt;
Signed-off-by: Shawn O. Pearce &lt;spearce@spearce.org&gt;
diff --git 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;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -639,7 +639,7 @@ static int prepare_to_commit(const char index_file, const char prefix)`
`639`	`639`	`active_cache_tree = cache_tree();`
`640`	`640`	`if (cache_tree_update(active_cache_tree,`
`641`	`641`	`active_cache, active_nr, 0, 0) < 0) {`
`642`		`- error("Error building trees");`
	`642`	`+ error("Error building trees; the index is unmerged?");`
`643`	`643`	`return 0;`
`644`	`644`	`}`
`645`	`645`