diff options
| author | Brandon Williams <bmwill@google.com> | 2017-10-31 11:19:06 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-11-01 11:50:02 +0900 |
| commit | afa73c5384de1d01386e57bd575257d1420aeb21 (patch) | |
| tree | 2d3b79fb98c6c72ff4445ed4638e89b95d77bd09 /builtin | |
| parent | 02f2f56bc377c287c411947d0e1482aac888f8db (diff) | |
| download | git-afa73c5384de1d01386e57bd575257d1420aeb21.tar.gz git-afa73c5384de1d01386e57bd575257d1420aeb21.tar.xz | |
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 'builtin')
| -rw-r--r-- | builtin/log.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/log.c b/builtin/log.c index dc28d43eb..82131751d 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -485,7 +485,7 @@ static int show_blob_object(const struct object_id *oid, struct rev_info *rev, c unsigned long size; fflush(rev->diffopt.file); - if (!DIFF_OPT_TOUCHED(&rev->diffopt, ALLOW_TEXTCONV) || + if (!DIFF_OPT_TST(&rev->diffopt, TEXTCONV_SET_VIA_CMDLINE) || !DIFF_OPT_TST(&rev->diffopt, ALLOW_TEXTCONV)) return stream_blob_to_fd(1, oid, NULL, 0); |