From: Tim Harper Date: Sat, 03 May 2008 16:59:32 GMT Subject: [PATCH] "not uptodate" changed to "has local changes" Message-ID: <1209833972-12256-1-git-send-email-timcharper@gmail.com> When doing a merge, the message says "file.txt: needs update", or "file.txt: not uptodate, cannot merge". While internally 'uptodate' makes sense, from the outside it's a mystery. This patch will make git a little more human friendly, reporting "file.txt: has local changes". --- read-cache.c | 2 +- unpack-trees.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/read-cache.c b/read-cache.c index a92b25b..e890b27 100644 --- a/read-cache.c +++ b/read-cache.c @@ -999,7 +999,7 @@ int refresh_index(struct index_state *istate, unsigned int flags, const char **p } if (quiet) continue; - printf("%s: needs update\n", ce->name); + printf("%s: has local changes\n", ce->name); has_errors = 1; continue; } diff --git a/unpack-trees.c b/unpack-trees.c index a59f475..1d67e08 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -427,7 +427,7 @@ static int verify_uptodate(struct cache_entry *ce, if (errno == ENOENT) return 0; return o->gently ? -1 : - error("Entry '%s' not uptodate. Cannot merge.", ce->name); + error("Entry '%s' has local changes. Cannot merge.", ce->name); } static void invalidate_ce_path(struct cache_entry *ce, struct unpack_trees_options *o) -- 1.5.5.1