projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'jc/name' into next
[git.git]
/
update-index.c
diff --git
a/update-index.c
b/update-index.c
index
ce1db38
..
797245a
100644
(file)
--- a/
update-index.c
+++ b/
update-index.c
@@
-577,9
+577,11
@@
int main(int argc, const char **argv)
break;
}
if (!strcmp(path, "--index-info")) {
break;
}
if (!strcmp(path, "--index-info")) {
+ if (i != argc - 1)
+ die("--index-info must be at the end");
allow_add = allow_replace = allow_remove = 1;
read_index_info(line_termination);
allow_add = allow_replace = allow_remove = 1;
read_index_info(line_termination);
-
continue
;
+
break
;
}
if (!strcmp(path, "--ignore-missing")) {
not_new = 1;
}
if (!strcmp(path, "--ignore-missing")) {
not_new = 1;