Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
status: do not report errors in sequencer/todo
[gitweb.git]
/
builtin
/
merge-file.c
diff --git
a/builtin/merge-file.c
b/builtin/merge-file.c
index b08803e61119a569e2ca5a33402666d8978d9ff0..06a2f90c4875f2a8ff82a927071ac584ad929f8b 100644
(file)
--- a/
builtin/merge-file.c
+++ b/
builtin/merge-file.c
@@
-15,6
+15,8
@@
static int label_cb(const struct option *opt, const char *arg, int unset)
static int label_count = 0;
const char **names = (const char **)opt->value;
+ BUG_ON_OPT_NEG(unset);
+
if (label_count >= 3)
return error("too many labels on the command line");
names[label_count++] = arg;