From: Junio C Hamano <gitster@pobox.com>
To: Elijah Newren <newren@gmail.com>
Cc: Ben Peart <Ben.Peart@microsoft.com>,
"git\@vger.kernel.org" <git@vger.kernel.org>,
"pclouds\@gmail.com" <pclouds@gmail.com>,
"vmiklos\@frugalware.org" <vmiklos@frugalware.org>,
Alejandro Pauly <alpauly@microsoft.com>,
"Johannes.Schindelin\@gmx.de" <Johannes.Schindelin@gmx.de>,
"eckhard.s.maass\@googlemail.com"
<eckhard.s.maass@googlemail.com>
Subject: Re: [PATCH v2] add status config and command line options for rename detection
Date: Fri, 11 May 2018 10:57:17 +0900 [thread overview]
Message-ID: <xmqqfu2zhs3m.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <CABPp-BGE6RXv3ka8wGXruFjk3W=kDEDJ6zpH3t5=_CGSTONCHQ@mail.gmail.com> (Elijah Newren's message of "Thu, 10 May 2018 09:19:00 -0700")
Elijah Newren <newren@gmail.com> writes:
>> Note: I removed the --no-breaks command line option from the original patch as
>> it will no longer be needed once the default has been changed [1] to turn it off.
>>
>> [1] https://public-inbox.org/git/20180430093421.27551-2-eckhard.s.maass@gmail.com/
>
> I'd just drop these lines from the commit message, and instead mention
> that your patch depends on em/status-rename-config.
>
>> Original-Patch-by: Alejandro Pauly <alpauly@microsoft.com>
>> Signed-off-by: Ben Peart <Ben.Peart@microsoft.com>
>> ---
Other things seem to have been resolved between you two already, so
I'll only comment on a minor tangent here.
>> Notes:
>> Base Ref: master
>
> This patch does not apply to master; it has conflicts.
>
>> Web-Diff: https://github.com/benpeart/git/commit/823212725b
As Git is distributed, unlike tags that are meant to be global among
project participants by convention, a branch name can never be used
as a trustable base among developers. Your 'master' branch may
point at a different commit from mine, and my 'master' branch today
may point at a different commit from mine yesterday.
I've seen patches that used a similar note below the three-dash line
that named an exact commit object name. That is a lot more reliable
way to convey the information necessary to consturct the exact state
the contributor worked on.
> This web diff shows em/status-rename-config as the parent commit, not
> master. Since your commit message mentions you want the change to
> break detection provided by that series, just listing it as the
> explicit base seems like the right way to go.
Thanks for digging. That would work well, too.
next prev parent reply other threads:[~2018-05-11 1:57 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-09 14:42 [PATCH v1] add status config and command line options for rename detection Ben Peart
2018-05-09 15:59 ` Duy Nguyen
2018-05-09 17:04 ` Ben Peart
2018-05-09 16:56 ` Elijah Newren
2018-05-09 19:54 ` Ben Peart
2018-05-10 14:16 ` [PATCH v2] " Ben Peart
2018-05-10 16:19 ` Elijah Newren
2018-05-10 19:09 ` Ben Peart
2018-05-10 22:31 ` Elijah Newren
2018-05-11 12:50 ` Ben Peart
2018-05-11 1:57 ` Junio C Hamano [this message]
2018-05-11 6:39 ` Junio C Hamano
2018-05-11 12:56 ` [PATCH v3] " Ben Peart
2018-05-11 14:33 ` Elijah Newren
2018-05-12 8:04 ` Eckhard Maaß
2018-05-14 12:57 ` Ben Peart
2018-05-11 15:38 ` [PATCH v4] " Ben Peart
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=xmqqfu2zhs3m.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=Ben.Peart@microsoft.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=alpauly@microsoft.com \
--cc=eckhard.s.maass@googlemail.com \
--cc=git@vger.kernel.org \
--cc=newren@gmail.com \
--cc=pclouds@gmail.com \
--cc=vmiklos@frugalware.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.