aboutsummaryrefslogtreecommitdiff
path: root/builtin-commit.c
diff options
context:
space:
mode:
authorRafael Garcia-Suarez <rgarciasuarez@gmail.com>2008-09-29 18:04:41 +0200
committerShawn O. Pearce <spearce@spearce.org>2008-09-29 09:13:20 -0700
commitcbce6c0be30cbaf8c39051f85006d679338a8ddc (patch)
tree9e8768427a54f37d0d0529c7d06cf6de92fa9489 /builtin-commit.c
parent94e02e7f3b0504243b364ad04b58332bb1502934 (diff)
downloadgit-cbce6c0be30cbaf8c39051f85006d679338a8ddc.tar.gz
git-cbce6c0be30cbaf8c39051f85006d679338a8ddc.tar.xz
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>
Diffstat (limited to 'builtin-commit.c')
-rw-r--r--builtin-commit.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-commit.c b/builtin-commit.c
index c870037b0..e2a7e48b1 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;
}