[PATCH] Better error message from checkout-cache for unmerged files.
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:41:52
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 <redacted> --- checkout-cache.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) checkout-cache.c: e16619c9d099367c224fb485f5525d66267bbd92
--- checkout-cache.c
+++ checkout-cache.c 2005-04-17 01:49:01.000000000 -0700@@ -121,8 +121,15 @@ { 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]);