projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
git.c: remove excess output for debugging when command is too long.
[git.git]
/
update-index.c
diff --git
a/update-index.c
b/update-index.c
index
a84836b
..
11b7f6a
100644
(file)
--- a/
update-index.c
+++ b/
update-index.c
@@
-338,7
+338,7
@@
static void read_index_info(int line_termination)
struct strbuf buf;
strbuf_init(&buf);
while (1) {
struct strbuf buf;
strbuf_init(&buf);
while (1) {
- char *ptr;
+ char *ptr
, *tab
;
char *path_name;
unsigned char sha1[20];
unsigned int mode;
char *path_name;
unsigned char sha1[20];
unsigned int mode;
@@
-348,12
+348,15
@@
static void read_index_info(int line_termination)
break;
mode = strtoul(buf.buf, &ptr, 8);
break;
mode = strtoul(buf.buf, &ptr, 8);
- if (ptr == buf.buf || *ptr != ' ' ||
- get_sha1_hex(ptr + 1, sha1) ||
- ptr[41] != '\t')
+ if (ptr == buf.buf || *ptr != ' ')
goto bad_line;
goto bad_line;
- ptr += 42;
+ tab = strchr(ptr, '\t');
+ if (!tab || tab - ptr < 41)
+ goto bad_line;
+ if (get_sha1_hex(tab - 40, sha1) || tab[-41] != ' ')
+ goto bad_line;
+ ptr = tab + 1;
if (line_termination && ptr[0] == '"')
path_name = unquote_c_style(ptr, NULL);
if (line_termination && ptr[0] == '"')
path_name = unquote_c_style(ptr, NULL);
@@
-392,6
+395,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] [--verbose] [--] <file>...";
+
int main(int argc, const char **argv)
{
int i, newfd, entries, has_errors = 0, line_termination = '\n';
int main(int argc, const char **argv)
{
int i, newfd, entries, has_errors = 0, line_termination = '\n';
@@
-489,6
+495,8
@@
int main(int argc, const char **argv)
verbose = 1;
continue;
}
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);
die("unknown option %s", path);
}
update_one(path, prefix, prefix_length);