From: Junio C Hamano Date: Sun, 17 Apr 2005 06:00:13 GMT Subject: [PATCH] update-cache --remove marks the path merged. Message-ID: <7vpswu0wpe.fsf@assigned-by-dhcp.cox.net> When update-cache --remove is run, resolve unmerged state for the path. This is consistent with the update-cache --add behaviour. Essentially, the user is telling us how he wants to resolve the merge by running update-cache. Signed-off-by: Junio C Hamano --- read-cache.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletion(-) read-cache.c: e16c37403092e1e94c50b04685b6417405ffc724 --- read-cache.c +++ read-cache.c 2005-04-16 22:43:55.000000000 -0700 @@ -368,7 +368,9 @@ int remove_file_from_cache(char *path) { int pos = cache_name_pos(path, strlen(path)); - if (pos >= 0) + if (pos < 0) + pos = -pos-1; + while (! strcmp(active_cache[pos]->name, path)) remove_entry_at(pos); return 0; }