X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=update-index.c;h=661b86a979e7c75ea9b3ca9d030aebb44693ee04;hb=211b5f9e62cc961acda59392fbf5a3efa8106c97;hp=1eeb45dbb18a7a9fb081a6ce1b4d9558f2ff7b21;hpb=f51248eb482a7a0feacb04d02119c94d35845975;p=git.git diff --git a/update-index.c b/update-index.c index 1eeb45db..661b86a9 100644 --- a/update-index.c +++ b/update-index.c @@ -5,6 +5,7 @@ */ #include "cache.h" #include "strbuf.h" +#include "quote.h" /* * Default to not allowing changes to the list of files. The @@ -13,8 +14,15 @@ * like "git-update-index *" and suddenly having all the object * files be revision controlled. */ -static int allow_add = 0, allow_remove = 0, allow_replace = 0, allow_unmerged = 0, not_new = 0, quiet = 0, info_only = 0; +static int allow_add; +static int allow_remove; +static int allow_replace; +static int allow_unmerged; /* --refresh needing merge is not error */ +static int not_new; /* --refresh not having working tree files is not error */ +static int quiet; /* --refresh needing update is not error */ +static int info_only; static int force_remove; +static int verbose; /* Three functions to allow overloaded pointer return; see linux/err.h */ static inline void *ERR_PTR(long error) @@ -32,6 +40,19 @@ static inline long IS_ERR(const void *ptr) return (unsigned long)ptr > (unsigned long)-1000L; } +static void report(const char *fmt, ...) +{ + va_list vp; + + if (!verbose) + return; + + va_start(vp, fmt); + vprintf(fmt, vp); + putchar('\n'); + va_end(vp); +} + static int add_file_to_cache(const char *path) { int size, namelen, option, status; @@ -260,7 +281,11 @@ static int add_cacheinfo(const char *arg1, const char *arg2, const char *arg3) ce->ce_mode = create_ce_mode(mode); option = allow_add ? ADD_CACHE_OK_TO_ADD : 0; option |= allow_replace ? ADD_CACHE_OK_TO_REPLACE : 0; - return add_cache_entry(ce, option); + if (add_cache_entry(ce, option)) + return error("%s: cannot add to the index - missing --add option?", + arg3); + report("add '%s'", arg3); + return 0; } static int chmod_path(int flip, const char *path) @@ -300,10 +325,12 @@ static void update_one(const char *path, const char *prefix, int prefix_length) if (force_remove) { if (remove_file_from_cache(p)) die("git-update-index: unable to remove %s", path); + report("remove '%s'", path); return; } if (add_file_to_cache(p)) die("Unable to process file %s", path); + report("add '%s'", path); } static void read_index_info(int line_termination) @@ -312,6 +339,7 @@ static void read_index_info(int line_termination) strbuf_init(&buf); while (1) { char *ptr; + char *path_name; unsigned char sha1[20]; unsigned int mode; @@ -326,14 +354,22 @@ static void read_index_info(int line_termination) goto bad_line; ptr += 42; - if (!verify_path(ptr)) { - fprintf(stderr, "Ignoring path %s\n", ptr); + + if (line_termination && ptr[0] == '"') + path_name = unquote_c_style(ptr, NULL); + else + path_name = ptr; + + if (!verify_path(path_name)) { + fprintf(stderr, "Ignoring path %s\n", path_name); + if (path_name != ptr) + free(path_name); continue; } if (!mode) { /* mode == 0 means there is no such path -- remove */ - if (remove_file_from_cache(ptr)) + if (remove_file_from_cache(path_name)) die("git-update-index: unable to remove %s", ptr); } @@ -343,10 +379,12 @@ static void read_index_info(int line_termination) * ptr[-41] is at the beginning of sha1 */ ptr[-42] = ptr[-1] = 0; - if (add_cacheinfo(buf.buf, ptr-41, ptr)) + if (add_cacheinfo(buf.buf, ptr-41, path_name)) die("git-update-index: unable to update %s", - ptr); + path_name); } + if (path_name != ptr) + free(path_name); continue; bad_line: @@ -354,6 +392,9 @@ static void read_index_info(int line_termination) } } +static const char update_index_usage[] = +"git-update-index [-q] [--add] [--replace] [--remove] [--unmerged] [--refresh] [--cacheinfo] [--chmod=(+|-)x] [--info-only] [--force-remove] [--stdin] [--index-info] [--ignore-missing] [-z] [--version] [--] ..."; + int main(int argc, const char **argv) { int i, newfd, entries, has_errors = 0, line_termination = '\n'; @@ -447,6 +488,12 @@ int main(int argc, const char **argv) not_new = 1; continue; } + if (!strcmp(path, "--verbose")) { + verbose = 1; + continue; + } + if (!strcmp(path, "-h") || !strcmp(path, "--help")) + usage(update_index_usage); die("unknown option %s", path); } update_one(path, prefix, prefix_length);