On Fri, Dec 20, 2019 at 11:28 AM Junio C Hamano <gitster@xxxxxxxxx> wrote: > > "Elijah Newren via GitGitGadget" <gitgitgadget@xxxxxxxxx> writes: > > > From: Elijah Newren <newren@xxxxxxxxx> > > > > am previously only checked gpg-related config options and the default > > config options while ignoring any diff-related options. This meant that > > when users tried to set diff.context to something larger than the > > default value of 3, it was ignored. Pay attention to the diff settings > > too. > > Can the benefit brought in by this change demonstrated by a new test > or two? Yeah, I'll try to come up with something. I was originally going to test 'git -c diff.context=5 rebase', but of course that depends on Denton's change too to work. > Puzzled. "am" accepts whatever patch somebody else prepared and > has no control over how the incoming "diff" was produced by that > somebody else. I was too, but the diff.context change didn't work until I fixed both format-patch and am to pay attention to diff.context. > Besides, I do not think it should be affected by any diff_*UI*_config() > in the first place. Does that mean that diff.context is checked in the wrong place in diff.c, and should be moved from git_diff_ui_config() to git_diff_basic_config()? (And perhaps the same is true for diff.algorithm?)
