[PATCH 02/13] am: handle --no-patch-format option
- From
Jeff King <peff@peff.net>
- Date
- Nov 5, 2018, 06:38 UTC
- Message-ID
- <20181105063839.GB25864@sigill.intra.peff.net>
- In-Reply-To
- <20181105063718.GA24877@sigill.intra.peff.net>
Running "git am --no-patch-format" will currently segfault, since it tries to parse a NULL argument. Instead, let's have it cancel any previous --patch-format option.
Signed-off-by: Jeff King <peff@peff.net> --- builtin/am.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/builtin/am.c b/builtin/am.c index 3ee9a9d2a9..dcb880b699 100644 --- 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;
-- 2.19.1.1505.g9cd28186cf