Commit 9b63f501 authored by Petr Baudis's avatar Petr Baudis Committed by Linus Torvalds

[PATCH] Make git-update-cache --force-remove regular

Make the --force-remove flag behave same as --add, --remove and
--replace. This means I can do

	git-update-cache --force-remove -- file1.c file2.c

which is probably saner and also makes it easier to use in cg-rm.
Signed-off-by: Petr Baudis's avatarPetr Baudis <[email protected]>
Signed-off-by: default avatarLinus Torvalds <[email protected]>
parent 418aaf84
......@@ -12,7 +12,7 @@ SYNOPSIS
'git-update-cache'
[--add] [--remove] [--refresh] [--replace]
[--ignore-missing]
[--force-remove <file>]
[--force-remove]
[--cacheinfo <mode> <object> <file>]\*
[--] [<file>]\*
......@@ -49,7 +49,7 @@ OPTIONS
--force-remove::
Remove the file from the index even when the working directory
still has such a file.
still has such a file. (Implies --remove.)
--replace::
By default, when a file `path` exists in the index,
......
......@@ -13,6 +13,7 @@
* files be revision controlled.
*/
static int allow_add = 0, allow_remove = 0, allow_replace = 0, not_new = 0;
static int force_remove;
/* Three functions to allow overloaded pointer return; see linux/err.h */
static inline void *ERR_PTR(long error)
......@@ -376,11 +377,7 @@ int main(int argc, char **argv)
continue;
}
if (!strcmp(path, "--force-remove")) {
if (argc <= i + 1)
die("git-update-cache: --force-remove <path>");
if (remove_file_from_cache(argv[i+1]))
die("git-update-cache: --force-remove cannot remove %s", argv[i+1]);
i++;
force_remove = 1;
continue;
}
......@@ -394,6 +391,11 @@ int main(int argc, char **argv)
fprintf(stderr, "Ignoring path %s\n", argv[i]);
continue;
}
if (force_remove) {
if (remove_file_from_cache(path))
die("git-update-cache: --force-remove cannot remove %s", path);
continue;
}
if (add_file_to_cache(path))
die("Unable to add %s to database", path);
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment