diff.h: move pickaxe fields together again · freshlybakedca.ke/git@a47fcbe

Git fork

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>

authored by

Ævar Arnfjörð Bjarmason and committed by

Junio C Hamano 4 years ago a47fcbe6 d26ec880

+1 -2

1 changed file

expand all

diff.h

+1 -2

diff.h

··· 265 265 * postimage of the diff_queue. 266 266 */ 267 267 const char *pickaxe; 268 + unsigned pickaxe_opts; 268 269 269 270 /* -I<regex> */ 270 271 regex_t **ignore_regex; ··· 303 304 304 305 /* The output format used when `diff_flush()` is run. */ 305 306 int output_format; 306 - 307 - unsigned pickaxe_opts; 308 307 309 308 /* Affects the way detection logic for complete rewrites, renames and 310 309 * copies.