[PATCH] Better error message from checkout-cache for unmerged files.

The checkout-cache command says "file is not in the cache" when
an unmerged path is given.  This patch adds code to distinguish
the unmerged and the nonexistent cases and gives an appropriate
error message.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/checkout-cache.c b/checkout-cache.c
index b909f5d9a0ec10c99b850bf794cb7a4191cd0740..1c257666e641868ff8a12a4e96a03a1d787c84a6 100644 (file)
--- a/checkout-cache.c
+++ b/checkout-cache.c
@@ -121,8 +121,15 @@ static int checkout_file(const char *name)
 {
        int pos = cache_name_pos(name, strlen(name));
        if (pos < 0) {
-               if (!quiet)
-                       fprintf(stderr, "checkout-cache: %s is not in the cache\n", name);
+               if (!quiet) {
+                       pos = -pos - 1;
+                       fprintf(stderr,
+                               "checkout-cache: %s is %s.\n",
+                               name,
+                               (pos < active_nr &&
+                                !strcmp(active_cache[pos]->name, name)) ?
+                               "unmerged" : "not in the cache");
+               }
                return -1;
        }
        return checkout_entry(active_cache[pos]);