* [PATCH] Clarify commit error message for unmerged files
@ 2008-09-29 16:04 Rafael Garcia-Suarez
0 siblings, 0 replies; only message in thread
From: Rafael Garcia-Suarez @ 2008-09-29 16:04 UTC (permalink / raw)
To: git; +Cc: Rafael Garcia-Suarez
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>
---
builtin-commit.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/builtin-commit.c b/builtin-commit.c
index 8165bb3..6b23143 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;
}
--
1.6.0.2.307.gc4275.dirty
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2008-09-29 16:05 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-09-29 16:04 [PATCH] Clarify commit error message for unmerged files Rafael Garcia-Suarez
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).