From: Michael J Gruber <git@grubix.eu>
To: git@vger.kernel.org
Cc: Ekelhart Jakob <jakob.ekelhart@fsw.at>,
Junio C Hamano <gitster@pobox.com>, Jeff King <peff@peff.net>
Subject: [PATCH 0/3] merge-base --fork-point fixes
Date: Thu, 14 Sep 2017 15:15:17 +0200 [thread overview]
Message-ID: <cover.1505394278.git.git@grubix.eu> (raw)
In-Reply-To: <68633b20-9e2b-ae23-2ede-8728283250f0@grubix.eu>
merge-base --fork-point does not quite work as advertised when the
reflog is empty or partial. This series brings it in line with the
documentation and, hopefully, with the original intent.
Michael J Gruber (3):
t6010: test actual test output
merge-base: return fork-point outside reflog
merge-base: find fork-point outside partial reflog
builtin/merge-base.c | 20 ++++----------------
t/t6010-merge-base.sh | 21 +++++++++++++++++++--
2 files changed, 23 insertions(+), 18 deletions(-)
--
2.14.1.712.gda4591c8a2
next prev parent reply other threads:[~2017-09-14 13:15 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 ` Michael J Gruber [this message]
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
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=cover.1505394278.git.git@grubix.eu \
--to=git@grubix.eu \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--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.
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.