Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
assert NOARG/NONEG behavior of parse-options callbacks
[gitweb.git]
/
builtin
/
am.c
diff --git
a/builtin/am.c
b/builtin/am.c
index 3ee9a9d2a92aaa0e9716719640deaec7e260c811..dcb880b699a5c17311f0dbc083b9a3eda3a6b0fd 100644
(file)
--- a/
builtin/am.c
+++ b/
builtin/am.c
@@
-2165,7
+2165,9
@@
static int parse_opt_patchformat(const struct option *opt, const char *arg, int
{
int *opt_value = opt->value;
- if (!strcmp(arg, "mbox"))
+ if (unset)
+ *opt_value = PATCH_FORMAT_UNKNOWN;
+ else if (!strcmp(arg, "mbox"))
*opt_value = PATCH_FORMAT_MBOX;
else if (!strcmp(arg, "stgit"))
*opt_value = PATCH_FORMAT_STGIT;