summaryrefslogtreecommitdiff
path: root/parse-options.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-04-25 16:41:14 +0900
committerJunio C Hamano <gitster@pobox.com>2019-04-25 16:41:14 +0900
commitb72e90712eb0e802b232ad4c88460d04279c7111 (patch)
treefa942ba292b5e3dd1091c526700a7d801ef40358 /parse-options.c
parentd2dba18ced8e4939a3cd135998c54874ce73adc1 (diff)
parent20de316e33446f37200e51aa333ba7d824dfd478 (diff)
downloadgit-b72e90712eb0e802b232ad4c88460d04279c7111.tar.gz
Merge branch 'js/difftool-no-index'
"git difftool" can now run outside a repository. * js/difftool-no-index: difftool: allow running outside Git worktrees with --no-index parse-options: make OPT_ARGUMENT() more useful difftool: remove obsolete (and misleading) comment
Diffstat (limited to 'parse-options.c')
-rw-r--r--parse-options.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/parse-options.c b/parse-options.c
index bf2037f6e1..cb24f1aa8a 100644
--- a/parse-options.c
+++ b/parse-options.c
@@ -288,6 +288,8 @@ again:
optname(options, flags));
if (*rest)
continue;
+ if (options->value)
+ *(int *)options->value = options->defval;
p->out[p->cpidx++] = arg - 2;
return PARSE_OPT_DONE;
}