summaryrefslogtreecommitdiff
path: root/diff.h
diff options
context:
space:
mode:
authorBrandon Williams <bmwill@google.com>2017-10-31 18:19:06 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-11-01 02:50:02 (GMT)
commitafa73c5384de1d01386e57bd575257d1420aeb21 (patch)
tree2d3b79fb98c6c72ff4445ed4638e89b95d77bd09 /diff.h
parent02f2f56bc377c287c411947d0e1482aac888f8db (diff)
downloadgit-afa73c5384de1d01386e57bd575257d1420aeb21.zip
git-afa73c5384de1d01386e57bd575257d1420aeb21.tar.gz
git-afa73c5384de1d01386e57bd575257d1420aeb21.tar.bz2
diff: add flag to indicate textconv was set via cmdline
git-show is unique in that it wants to use textconv by default except for when it is showing blobs. When asked to show a blob, show doesn't want to use textconv unless the user explicitly requested that it be used by providing the command line flag '--textconv'. Currently this is done by using a parallel set of 'touched' flags which get set every time a particular flag is set or cleared. In a future patch we want to eliminate this parallel set of flags so instead of relying on if the textconv flag has been touched, add a new flag 'TEXTCONV_SET_VIA_CMDLINE' which is only set if textconv is set to true via the command line. Signed-off-by: Brandon Williams <bmwill@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diff.h')
-rw-r--r--diff.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/diff.h b/diff.h
index e512cf4..d077d3c 100644
--- a/diff.h
+++ b/diff.h
@@ -83,6 +83,7 @@ struct diff_flags {
unsigned DIRSTAT_CUMULATIVE:1;
unsigned DIRSTAT_BY_FILE:1;
unsigned ALLOW_TEXTCONV:1;
+ unsigned TEXTCONV_SET_VIA_CMDLINE:1;
unsigned DIFF_FROM_CONTENTS:1;
unsigned DIRTY_SUBMODULES:1;
unsigned IGNORE_UNTRACKED_IN_SUBMODULES:1;