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 21:37:17 -0800 [thread overview]
Message-ID: <CABPp-BEReoD+YUZuniNqkDabYqdKrFvzPeNbWpRPexXUuX0XiQ@mail.gmail.com> (raw)
In-Reply-To: <xmqq1rsy8w3c.fsf@gitster-ct.c.googlers.com>
On Fri, Dec 20, 2019 at 2:34 PM Junio C Hamano <gitster@pobox.com> wrote:
>
> Elijah Newren <newren@gmail.com> writes:
>
> > diff.context should NOT affect plumbing. So if it's not plumbing by
> > that test, and it's not *UI* as per what you say, what exactly is it?
>
> I actually was saying that diff.context is UI thing, and should make
> no effect on how "am" interprets its input.
>
> Which the codepath in "am" are you trying to affect? "am" is mainly
> a consumer of "diff" output, and not a producer, so ...
Okay, I can't seem to find a simple way to reproduce separate from the
testcase reported here:
https://lore.kernel.org/git/CAN_72e2h2avv-U9BVBYqXVKiC+5kHy-pjejyMSD3X22uRXE39g@mail.gmail.com/
To summarize, when I run these exact steps:
git clone --quiet https://github.com/proski/git-rebase-demo
cd git-rebase-demo
git checkout --quiet branch1
git -c diff.context=5 rebase --quiet origin/branch2
test $? -eq 0 && echo Successfully rebased
echo Difference from expected:
git diff --shortstat origin/merge-good
The rebase succeeds in both cases, but I get different output from the
shortstat depending on whether or not this git_am_config patch is
applied.
I can't seem to track down why this patch makes a difference when as
you say it shouldn't, nor can I seem to generate an am-only testcase.
I feel like it should be easy to get at least one of these given the
short steps to reproduce (the repo only has 1 file and three relevant
commits), but it seems to be stumping me nonetheless.
next prev parent reply other threads:[~2019-12-21 5:37 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
2019-12-20 22:22 ` Elijah Newren
2019-12-20 22:34 ` Junio C Hamano
2019-12-21 5:37 ` Elijah Newren [this message]
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
-- strict thread matches above, loose matches on Subject: below --
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-BEReoD+YUZuniNqkDabYqdKrFvzPeNbWpRPexXUuX0XiQ@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).