kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

diff: factor out src/dst prefix setup 

We directly manipulate diffopt's a_prefix and b_prefix to set up either
the default "a/foo" prefix or the "--no-prefix" variant. Although this
is only a few lines, it's worth pulling these into their own functions.
That lets us avoid one repetition already in this patch, but will also
give us a cleaner interface for callers which want to tweak this
setting.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Jeff King 2023-03-09 01:07:06 -05:00 committed by Junio C Hamano
parent 725f57037d
commit 6799aadfdf
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
diff.c
View File

@ -3374,6 +3374,17 @@ void diff_set_mnemonic_prefix(struct diff_options *options, const char *a, const
options->b_prefix = b; options->b_prefix = b;
} }


void diff_set_noprefix(struct diff_options *options)
{
options->a_prefix = options->b_prefix = "";
}

void diff_set_default_prefix(struct diff_options *options)
{
options->a_prefix = "a/";
options->b_prefix = "b/";
}

struct userdiff_driver *get_textconv(struct repository *r, struct userdiff_driver *get_textconv(struct repository *r,
struct diff_filespec *one) struct diff_filespec *one)
{ {
@ -4674,10 +4685,9 @@ void repo_diff_setup(struct repository *r, struct diff_options *options)
options->flags.ignore_untracked_in_submodules = 1; options->flags.ignore_untracked_in_submodules = 1;


if (diff_no_prefix) { if (diff_no_prefix) {
options->a_prefix = options->b_prefix = ""; diff_set_noprefix(options);
} else if (!diff_mnemonic_prefix) { } else if (!diff_mnemonic_prefix) {
options->a_prefix = "a/"; diff_set_default_prefix(options);
options->b_prefix = "b/";
} }


options->color_moved = diff_color_moved_default; options->color_moved = diff_color_moved_default;
@ -5261,8 +5271,7 @@ static int diff_opt_no_prefix(const struct option *opt,


BUG_ON_OPT_NEG(unset); BUG_ON_OPT_NEG(unset);
BUG_ON_OPT_ARG(optarg); BUG_ON_OPT_ARG(optarg);
options->a_prefix = ""; diff_set_noprefix(options);
options->b_prefix = "";
return 0; return 0;
} }



2
diff.h
View File

@ -497,6 +497,8 @@ void diff_tree_combined(const struct object_id *oid, const struct oid_array *par
void diff_tree_combined_merge(const struct commit *commit, struct rev_info *rev); void diff_tree_combined_merge(const struct commit *commit, struct rev_info *rev);


void diff_set_mnemonic_prefix(struct diff_options *options, const char *a, const char *b); void diff_set_mnemonic_prefix(struct diff_options *options, const char *a, const char *b);
void diff_set_noprefix(struct diff_options *options);
void diff_set_default_prefix(struct diff_options *options);


int diff_can_quit_early(struct diff_options *); int diff_can_quit_early(struct diff_options *);