projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Work around git-http-pull breakage in git-fetch-script
[git.git]
/
update-cache.c
diff --git
a/update-cache.c
b/update-cache.c
index
48b4dee
..
7c2698d
100644
(file)
--- a/
update-cache.c
+++ b/
update-cache.c
@@
-12,7
+12,8
@@
* like "git-update-cache *" and suddenly having all the object
* files be revision controlled.
*/
* like "git-update-cache *" and suddenly having all the object
* 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, quiet = 0;
+static int force_remove;
/* Three functions to allow overloaded pointer return; see linux/err.h */
static inline void *ERR_PTR(long error)
/* Three functions to allow overloaded pointer return; see linux/err.h */
static inline void *ERR_PTR(long error)
@@
-221,10
+222,12
@@
static int refresh_cache(void)
new = refresh_entry(ce);
if (IS_ERR(new)) {
new = refresh_entry(ce);
if (IS_ERR(new)) {
- if (!(not_new && PTR_ERR(new) == -ENOENT)) {
- printf("%s: needs update\n", ce->name);
- has_errors = 1;
- }
+ if (not_new && PTR_ERR(new) == -ENOENT)
+ continue;
+ if (quiet)
+ continue;
+ printf("%s: needs update\n", ce->name);
+ has_errors = 1;
continue;
}
active_cache_changed = 1;
continue;
}
active_cache_changed = 1;
@@
-351,6
+354,10
@@
int main(int argc, char **argv)
allow_options = 0;
continue;
}
allow_options = 0;
continue;
}
+ if (!strcmp(path, "-q")) {
+ quiet = 1;
+ continue;
+ }
if (!strcmp(path, "--add")) {
allow_add = 1;
continue;
if (!strcmp(path, "--add")) {
allow_add = 1;
continue;
@@
-376,11
+383,7
@@
int main(int argc, char **argv)
continue;
}
if (!strcmp(path, "--force-remove")) {
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;
}
continue;
}
@@
-394,6
+397,11
@@
int main(int argc, char **argv)
fprintf(stderr, "Ignoring path %s\n", argv[i]);
continue;
}
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);
}
if (add_file_to_cache(path))
die("Unable to add %s to database", path);
}