diff options
author | Junio C Hamano <gitster@pobox.com> | 2019-05-30 10:50:44 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-05-30 10:50:44 -0700 |
commit | 20aa7c594fbc2e36476daae2f53d7c020306c62c (patch) | |
tree | 16594455c941e4bc0002e32a624d27a29b0caeed /diff.h | |
parent | Git 2.22-rc1 (diff) | |
parent | parse-options: check empty value in OPT_INTEGER and OPT_ABBREV (diff) | |
download | tgif-20aa7c594fbc2e36476daae2f53d7c020306c62c.tar.xz |
Merge branch 'nd/diff-parseopt'
A brown-paper-bag bugfix to a change already in 'master'.
* nd/diff-parseopt:
parse-options: check empty value in OPT_INTEGER and OPT_ABBREV
diff-parseopt: restore -U (no argument) behavior
diff-parseopt: correct variable types that are used by parseopt
Diffstat (limited to 'diff.h')
-rw-r--r-- | diff.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -169,7 +169,7 @@ struct diff_options { const char *prefix; int prefix_length; const char *stat_sep; - long xdl_opts; + int xdl_opts; /* see Documentation/diff-options.txt */ char **anchors; |