mirror of
https://github.com/git/git
synced 2024-06-30 22:54:27 +00:00
Merge branch 'kh/range-diff-notes'
"git range-diff --notes=foo" compared "log --notes=foo --notes" of the two ranges, instead of using just the specified notes tree. * kh/range-diff-notes: range-diff: treat notes like `log`
This commit is contained in:
commit
5cd3f68add
|
@ -87,6 +87,10 @@ being displayed. Examples: "--notes=foo" will show only notes from
|
||||||
"--notes --notes=foo --no-notes --notes=bar" will only show notes
|
"--notes --notes=foo --no-notes --notes=bar" will only show notes
|
||||||
from "refs/notes/bar".
|
from "refs/notes/bar".
|
||||||
|
|
||||||
|
--show-notes-by-default::
|
||||||
|
Show the default notes unless options for displaying specific
|
||||||
|
notes are given.
|
||||||
|
|
||||||
--show-notes[=<ref>]::
|
--show-notes[=<ref>]::
|
||||||
--[no-]standard-notes::
|
--[no-]standard-notes::
|
||||||
These options are deprecated. Use the above --notes/--no-notes
|
These options are deprecated. Use the above --notes/--no-notes
|
||||||
|
|
|
@ -60,7 +60,7 @@ static int read_patches(const char *range, struct string_list *list,
|
||||||
"--output-indicator-context=#",
|
"--output-indicator-context=#",
|
||||||
"--no-abbrev-commit",
|
"--no-abbrev-commit",
|
||||||
"--pretty=medium",
|
"--pretty=medium",
|
||||||
"--notes",
|
"--show-notes-by-default",
|
||||||
NULL);
|
NULL);
|
||||||
strvec_push(&cp.args, range);
|
strvec_push(&cp.args, range);
|
||||||
if (other_arg)
|
if (other_arg)
|
||||||
|
|
|
@ -2484,6 +2484,8 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg
|
||||||
revs->break_bar = xstrdup(optarg);
|
revs->break_bar = xstrdup(optarg);
|
||||||
revs->track_linear = 1;
|
revs->track_linear = 1;
|
||||||
revs->track_first_time = 1;
|
revs->track_first_time = 1;
|
||||||
|
} else if (!strcmp(arg, "--show-notes-by-default")) {
|
||||||
|
revs->show_notes_by_default = 1;
|
||||||
} else if (skip_prefix(arg, "--show-notes=", &optarg) ||
|
} else if (skip_prefix(arg, "--show-notes=", &optarg) ||
|
||||||
skip_prefix(arg, "--notes=", &optarg)) {
|
skip_prefix(arg, "--notes=", &optarg)) {
|
||||||
if (starts_with(arg, "--show-notes=") &&
|
if (starts_with(arg, "--show-notes=") &&
|
||||||
|
@ -3054,6 +3056,11 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s
|
||||||
if (revs->expand_tabs_in_log < 0)
|
if (revs->expand_tabs_in_log < 0)
|
||||||
revs->expand_tabs_in_log = revs->expand_tabs_in_log_default;
|
revs->expand_tabs_in_log = revs->expand_tabs_in_log_default;
|
||||||
|
|
||||||
|
if (!revs->show_notes_given && revs->show_notes_by_default) {
|
||||||
|
enable_default_display_notes(&revs->notes_opt, &revs->show_notes);
|
||||||
|
revs->show_notes_given = 1;
|
||||||
|
}
|
||||||
|
|
||||||
return left;
|
return left;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -253,6 +253,7 @@ struct rev_info {
|
||||||
shown_dashes:1,
|
shown_dashes:1,
|
||||||
show_merge:1,
|
show_merge:1,
|
||||||
show_notes_given:1,
|
show_notes_given:1,
|
||||||
|
show_notes_by_default:1,
|
||||||
show_signature:1,
|
show_signature:1,
|
||||||
pretty_given:1,
|
pretty_given:1,
|
||||||
abbrev_commit:1,
|
abbrev_commit:1,
|
||||||
|
|
|
@ -662,6 +662,20 @@ test_expect_success 'range-diff with multiple --notes' '
|
||||||
test_cmp expect actual
|
test_cmp expect actual
|
||||||
'
|
'
|
||||||
|
|
||||||
|
# `range-diff` should act like `log` with regards to notes
|
||||||
|
test_expect_success 'range-diff with --notes=custom does not show default notes' '
|
||||||
|
git notes add -m "topic note" topic &&
|
||||||
|
git notes add -m "unmodified note" unmodified &&
|
||||||
|
git notes --ref=custom add -m "topic note" topic &&
|
||||||
|
git notes --ref=custom add -m "unmodified note" unmodified &&
|
||||||
|
test_when_finished git notes remove topic unmodified &&
|
||||||
|
test_when_finished git notes --ref=custom remove topic unmodified &&
|
||||||
|
git range-diff --notes=custom main..topic main..unmodified \
|
||||||
|
>actual &&
|
||||||
|
! grep "## Notes ##" actual &&
|
||||||
|
grep "## Notes (custom) ##" actual
|
||||||
|
'
|
||||||
|
|
||||||
test_expect_success 'format-patch --range-diff does not compare notes by default' '
|
test_expect_success 'format-patch --range-diff does not compare notes by default' '
|
||||||
git notes add -m "topic note" topic &&
|
git notes add -m "topic note" topic &&
|
||||||
git notes add -m "unmodified note" unmodified &&
|
git notes add -m "unmodified note" unmodified &&
|
||||||
|
@ -679,6 +693,20 @@ test_expect_success 'format-patch --range-diff does not compare notes by default
|
||||||
! grep "note" 0000-*
|
! grep "note" 0000-*
|
||||||
'
|
'
|
||||||
|
|
||||||
|
test_expect_success 'format-patch --notes=custom --range-diff only compares custom notes' '
|
||||||
|
git notes add -m "topic note" topic &&
|
||||||
|
git notes --ref=custom add -m "topic note (custom)" topic &&
|
||||||
|
git notes add -m "unmodified note" unmodified &&
|
||||||
|
git notes --ref=custom add -m "unmodified note (custom)" unmodified &&
|
||||||
|
test_when_finished git notes remove topic unmodified &&
|
||||||
|
test_when_finished git notes --ref=custom remove topic unmodified &&
|
||||||
|
git format-patch --notes=custom --cover-letter --range-diff=$prev \
|
||||||
|
main..unmodified >actual &&
|
||||||
|
test_when_finished "rm 000?-*" &&
|
||||||
|
grep "## Notes (custom) ##" 0000-* &&
|
||||||
|
! grep "## Notes ##" 0000-*
|
||||||
|
'
|
||||||
|
|
||||||
test_expect_success 'format-patch --range-diff with --no-notes' '
|
test_expect_success 'format-patch --range-diff with --no-notes' '
|
||||||
git notes add -m "topic note" topic &&
|
git notes add -m "topic note" topic &&
|
||||||
git notes add -m "unmodified note" unmodified &&
|
git notes add -m "unmodified note" unmodified &&
|
||||||
|
|
Loading…
Reference in New Issue
Block a user