From: Elijah Newren <newren@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Elijah Newren via GitGitGadget <gitgitgadget@gmail.com>,
Git Mailing List <git@vger.kernel.org>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Pavel Roskin <plroskin@gmail.com>
Subject: Re: [PATCH 1/2] am: pay attention to user-defined context size
Date: Fri, 20 Dec 2019 11:38:42 -0800 [thread overview]
Message-ID: <CABPp-BFYyF5RbZVuwo8LtDZZQ9KQ2od4FQqQYaeSqNCNKcZXPw@mail.gmail.com> (raw)
In-Reply-To: <xmqqwoaq94ql.fsf@gitster-ct.c.googlers.com>
On Fri, Dec 20, 2019 at 11:28 AM Junio C Hamano <gitster@pobox.com> wrote:
>
> "Elijah Newren via GitGitGadget" <gitgitgadget@gmail.com> writes:
>
> > From: Elijah Newren <newren@gmail.com>
> >
> > 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?)
next prev parent reply other threads:[~2019-12-20 19:38 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-20 18:53 [PATCH 0/2] Rebase am fixes Elijah Newren via GitGitGadget
2019-12-20 18:53 ` [PATCH 1/2] am: pay attention to user-defined context size Elijah Newren via GitGitGadget
2019-12-20 19:28 ` Junio C Hamano
2019-12-20 19:38 ` Elijah Newren [this message]
2019-12-20 22:22 ` Elijah Newren
2019-12-20 22:34 ` Junio C Hamano
2019-12-21 5:37 ` Elijah Newren
2019-12-20 18:53 ` [PATCH 2/2] rebase: fix saving of --signoff state for am-based rebases Elijah Newren via GitGitGadget
2019-12-20 19:29 ` Junio C Hamano
2020-01-01 22:01 ` Johannes Schindelin
2023-09-03 21:29 [PATCH 1/2] am: pay attention to user-defined context size tony raynes
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CABPp-BFYyF5RbZVuwo8LtDZZQ9KQ2od4FQqQYaeSqNCNKcZXPw@mail.gmail.com \
--to=newren@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.com \
--cc=plroskin@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).