diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2021-04-12 19:15:16 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-05-11 05:47:31 +0200 |
| commit | a47fcbe6e412df295f1f5ffb8eca6dbe86d2b7bb (patch) | |
| tree | cff97a15a5e8fd87b536f9477315533a81829216 /diff.h | |
| parent | pickaxe: die when --find-object and --pickaxe-all are combined (diff) | |
| download | git-a47fcbe6e412df295f1f5ffb8eca6dbe86d2b7bb.tar.xz git-a47fcbe6e412df295f1f5ffb8eca6dbe86d2b7bb.zip | |
diff.h: move pickaxe fields together again
Move the pickaxe and pickaxe_opts fields next to each other again. In
a past life they'd been on adjacent lines, but when they got moved
from a global variable to the diff_options struct in 6b5ee137e5 (Diff
clean-up., 2005-09-21) they got split apart.
That split made sense at the time, the "char*" and "int" (flags)
options were being grouped, but we've long since abandoned that
pattern in the diff_options struct, and now it makes more sense to
group these together again.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diff.h')
| -rw-r--r-- | diff.h | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -265,6 +265,7 @@ struct diff_options { * postimage of the diff_queue. */ const char *pickaxe; + unsigned pickaxe_opts; /* -I<regex> */ regex_t **ignore_regex; @@ -304,8 +305,6 @@ struct diff_options { /* The output format used when `diff_flush()` is run. */ int output_format; - unsigned pickaxe_opts; - /* Affects the way detection logic for complete rewrites, renames and * copies. */ |