summaryrefslogtreecommitdiff
path: root/diff.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-05-30 10:50:44 -0700
committerJunio C Hamano <gitster@pobox.com>2019-05-30 10:50:44 -0700
commit20aa7c594fbc2e36476daae2f53d7c020306c62c (patch)
tree16594455c941e4bc0002e32a624d27a29b0caeed /diff.h
parentaa25c82427ae70aebf3b8f970f2afd54e9a2a8c6 (diff)
parentf7e68a08780e91d7c2f830f33457041407172b96 (diff)
downloadgit-20aa7c594fbc2e36476daae2f53d7c020306c62c.tar.gz
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.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/diff.h b/diff.h
index b20cbcc091..d5e44baa96 100644
--- a/diff.h
+++ b/diff.h
@@ -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;