From: Junio C Hamano <gitster@pobox.com>
To: Michael J Gruber <git@grubix.eu>
Cc: git@vger.kernel.org, Ekelhart Jakob <jakob.ekelhart@fsw.at>,
Jeff King <peff@peff.net>
Subject: Re: [PATCH 2/3] merge-base: return fork-point outside reflog
Date: Thu, 21 Sep 2017 15:27:08 +0900 [thread overview]
Message-ID: <xmqqshfgk1mr.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <xmqqshfnx1kl.fsf@gitster.mtv.corp.google.com> (Junio C. Hamano's message of "Sat, 16 Sep 2017 03:24:10 +0900")
Junio C Hamano <gitster@pobox.com> writes:
> ... I agree that there is a value in what your patch 2/3
> wants to do when the current one that is more strict would say
> "there is no known fork-point"---we would gain a way to say "... but
> this is the best guess based on available data that may be better
> than getting no answer." which we lack.
>
> Having said all that, I do not agree with your last sentence in the
> paragraph I quoted above. It is a mere implementation detail to
> consult the reflog to find out the set of "historical tips of the
> Branch"; the current tip by definition is among the commits in that
> set, even when the reflog of Branch is missing. What 4f21454b55 did
> was a reasonable "fix" that is still in line with the definition of
> "--fork-point" from that point of view.
>
> Whether we add a "looser" version of "--fork-point" to the system or
> not, the more strict version should still use the current tip as one
> of the historical tips (i.e. those that we would take from the
> reflog if the reflog were not empty) in the more "strict" mode. The
> looser version may also want to do so as well.
So, should I mark this in What's cooking report as "expecting a
reroll", anticipating that a new option would be added to trigger
the new & looser behaviour?
next prev parent reply other threads:[~2017-09-21 6:27 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <c76e76a4ef11480da9995b0bec5a70e1@SFSWW2K12EX02.intern.fsw.at>
2017-09-13 15:07 ` merge-base not working as expected when base is ahead Ekelhart Jakob
2017-09-14 8:09 ` Michael J Gruber
2017-09-14 13:15 ` [PATCH 0/3] merge-base --fork-point fixes Michael J Gruber
2017-09-14 13:15 ` [PATCH 1/3] t6010: test actual test output Michael J Gruber
2017-09-14 14:34 ` Jeff King
2017-09-15 10:01 ` Michael J Gruber
2017-09-15 11:20 ` Jeff King
2017-09-14 13:15 ` [PATCH 2/3] merge-base: return fork-point outside reflog Michael J Gruber
2017-09-15 2:48 ` Junio C Hamano
2017-09-15 9:59 ` Phillip Wood
2017-09-15 10:23 ` Michael J Gruber
2017-09-15 18:24 ` Junio C Hamano
2017-09-21 6:27 ` Junio C Hamano [this message]
2017-09-21 9:39 ` Michael J Gruber
2017-09-22 1:49 ` Junio C Hamano
2017-09-22 8:34 ` Michael J Gruber
2017-09-22 9:14 ` Junio C Hamano
2017-10-03 6:05 ` Junio C Hamano
2017-11-08 8:52 ` Ekelhart Jakob
2017-11-08 9:33 ` Michael J Gruber
2017-11-09 2:49 ` Junio C Hamano
2017-09-14 13:15 ` [PATCH 3/3] merge-base: find fork-point outside partial reflog Michael J Gruber
2017-09-14 14:37 ` Jeff King
2017-09-14 13:49 ` [PATCH 0/3] merge-base --fork-point fixes Johannes Schindelin
2017-09-14 14:38 ` Jeff King
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqshfgk1mr.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=git@grubix.eu \
--cc=git@vger.kernel.org \
--cc=jakob.ekelhart@fsw.at \
--cc=peff@peff.net \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).