diff --git a/update-index.c b/update-index.c
index ef82b8620cdb0e8ae41a27c1f85411998e7266eb..5bbc3de2898caddfd019fac77c6a1daf922250cf 100644 (file)
--- a/update-index.c
+++ b/update-index.c
*/
#include "cache.h"
#include "strbuf.h"
+#include "quote.h"
/*
* Default to not allowing changes to the list of files. The
strbuf_init(&buf);
while (1) {
char *ptr;
+ char *path_name;
unsigned char sha1[20];
unsigned int mode;
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);
}
* 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:
}
}
+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] [--verbose] [--] <file>...";
+
int main(int argc, const char **argv)
{
int i, newfd, entries, has_errors = 0, line_termination = '\n';
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);