undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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 <pasky@ucw.cz>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Petr Baudis 2005-05-31 18:52:43 +02:00 committed by Linus Torvalds
parent 418aaf847a
commit 9b63f50148
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/git-update-cache.txt
View File

@ -12,7 +12,7 @@ SYNOPSIS
'git-update-cache' 'git-update-cache'
[--add] [--remove] [--refresh] [--replace] [--add] [--remove] [--refresh] [--replace]
[--ignore-missing] [--ignore-missing]
[--force-remove <file>] [--force-remove]
[--cacheinfo <mode> <object> <file>]\* [--cacheinfo <mode> <object> <file>]\*
[--] [<file>]\* [--] [<file>]\*
@ -49,7 +49,7 @@ OPTIONS
--force-remove:: --force-remove::
Remove the file from the index even when the working directory Remove the file from the index even when the working directory
still has such a file. still has such a file. (Implies --remove.)
--replace:: --replace::
By default, when a file `path` exists in the index, By default, when a file `path` exists in the index,

12
update-cache.c
View File

@ -13,6 +13,7 @@
* files be revision controlled. * files be revision controlled.
*/ */
static int allow_add = 0, allow_remove = 0, allow_replace = 0, not_new = 0; 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 */ /* Three functions to allow overloaded pointer return; see linux/err.h */
static inline void *ERR_PTR(long error) static inline void *ERR_PTR(long error)
@ -376,11 +377,7 @@ int main(int argc, char **argv)
continue; continue;
} }
if (!strcmp(path, "--force-remove")) { if (!strcmp(path, "--force-remove")) {
if (argc <= i + 1) force_remove = 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++;
continue; continue;
} }
@ -394,6 +391,11 @@ int main(int argc, char **argv)
fprintf(stderr, "Ignoring path %s\n", argv[i]); fprintf(stderr, "Ignoring path %s\n", argv[i]);
continue; 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)) if (add_file_to_cache(path))
die("Unable to add %s to database", path); die("Unable to add %s to database", path);
} }