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

diff-merges: rename diff_merges_default_to_enable() to match semantics 

Rename diff_merges_default_to_enable() to
diff_merges_default_to_first_parent() to match its semantics.

Signed-off-by: Sergey Organov <sorganov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Sergey Organov 2020-12-21 18:19:36 +03:00 committed by Junio C Hamano
parent 7acf0d06f5
commit 4f54544d73
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/log.c
View File

@ -600,7 +600,7 @@ static void show_setup_revisions_tweak(struct rev_info *rev,
struct setup_revision_opt *opt) struct setup_revision_opt *opt)
{ {
if (rev->first_parent_only) if (rev->first_parent_only)
diff_merges_default_to_enable(rev); diff_merges_default_to_first_parent(rev);
else else
diff_merges_default_to_dense_combined(rev); diff_merges_default_to_dense_combined(rev);
if (!rev->diffopt.output_format) if (!rev->diffopt.output_format)
@ -728,7 +728,7 @@ static void log_setup_revisions_tweak(struct rev_info *rev,
rev->diffopt.output_format = DIFF_FORMAT_PATCH; rev->diffopt.output_format = DIFF_FORMAT_PATCH;


if (rev->first_parent_only) if (rev->first_parent_only)
diff_merges_default_to_enable(rev); diff_merges_default_to_first_parent(rev);
} }


int cmd_log(int argc, const char **argv, const char *prefix) int cmd_log(int argc, const char **argv, const char *prefix)

2
diff-merges.c
View File

@ -56,7 +56,7 @@ void diff_merges_setup_revs(struct rev_info *revs)
die("--combined-all-paths makes no sense without -c or --cc"); die("--combined-all-paths makes no sense without -c or --cc");
} }


void diff_merges_default_to_enable(struct rev_info *revs) void diff_merges_default_to_first_parent(struct rev_info *revs)
{ {
if (revs->ignore_merges < 0) /* No -m */ if (revs->ignore_merges < 0) /* No -m */
revs->ignore_merges = 0; revs->ignore_merges = 0;

2
diff-merges.h
View File

@ -17,7 +17,7 @@ void diff_merges_setup_revs(struct rev_info *revs);


void diff_merges_default_to_dense_combined(struct rev_info *revs); void diff_merges_default_to_dense_combined(struct rev_info *revs);


void diff_merges_default_to_enable(struct rev_info *revs); void diff_merges_default_to_first_parent(struct rev_info *revs);




#endif #endif