mirror of
https://github.com/git/git.git
synced 2025-12-12 20:36:24 +01:00
Merge branch 'kh/format-patch-range-diff-notes'
"git format-patch --range-diff=... --notes=..." did not drive the underlying range-diff with correct --notes parameter, ending up comparing with different set of notes from its main patch output you would get from "git format-patch --notes=..." for a singleton patch. * kh/format-patch-range-diff-notes: format-patch: handle range-diff on notes correctly for single patches revision: add rdiff_log_arg to rev_info range-diff: rename other_arg to log_arg
This commit is contained in:
@@ -718,7 +718,8 @@ static void show_diff_of_diff(struct rev_info *opt)
|
||||
.creation_factor = opt->creation_factor,
|
||||
.dual_color = 1,
|
||||
.max_memory = RANGE_DIFF_MAX_MEMORY_DEFAULT,
|
||||
.diffopt = &opts
|
||||
.diffopt = &opts,
|
||||
.log_arg = &opt->rdiff_log_arg
|
||||
};
|
||||
|
||||
memcpy(&dq, &diff_queued_diff, sizeof(diff_queued_diff));
|
||||
|
||||
Reference in New Issue
Block a user