From 0ff5bf7cfcb20a6c2404fe7b9cc6ff18e47db812 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 1 May 2005 23:50:51 -0700 Subject: [PATCH] Implement git-update-cache --force-remove This new flag tells git-update-cache to remove the named path even when the work tree still happens to have the file. It is used to update git-merge-one-file-script not to smudge the work tree. Signed-off-by: Junio C Hamano --- update-cache.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/update-cache.c b/update-cache.c index 0401372e4..bb25fa114 100644 --- a/update-cache.c +++ b/update-cache.c @@ -306,6 +306,15 @@ int main(int argc, char **argv) i += 3; continue; } + if (!strcmp(path, "--force-remove")) { + if (argc <= i + 1) + die("update-cache: --force-remove "); + if (remove_file_from_cache(argv[i+1])) + die("update-cache: --force-remove cannot remove %s", argv[i+1]); + i++; + continue; + } + if (!strcmp(path, "--ignore-missing")) { not_new = 1; continue; -- 2.26.2