From: Ekelhart Jakob <jakob.ekelhart@fsw.at>
To: "git@vger.kernel.org" <git@vger.kernel.org>
Cc: Matthias Lischka <matthias.lischka@fsw.at>
Subject: RE: merge-base not working as expected when base is ahead
Date: Wed, 13 Sep 2017 15:07:09 +0000 [thread overview]
Message-ID: <e697e5f0da0845ee92ffdb88a4fa48d9@SFSWW2K12EX02.intern.fsw.at> (raw)
In-Reply-To: <c76e76a4ef11480da9995b0bec5a70e1@SFSWW2K12EX02.intern.fsw.at>
Dear Git,
git merge-base --fork-point "master" not working if master is already newer then my current branch.
Very oddly it seems to work whenever you had the expected commit checked out previously - what made it very tricky to detect this problem.
Example:
- Clone "https://github.com/jekelhart/GitInfoTry"
- Switch to branch "v1.0.0"
- git merge-base --fork-point "master"
- or: git merge-base --fork-point "origin/master"
- expected result: fork point "fbb1db34c6317a6e8b319c1ec261e97ca1672c22"
- but result is empty
In the repo where we created this example tree in the first place the command returned the expected fork point. If you clone it new and fresh it does not return any result anymore.
Works, however, on branch "v2.0.0". Assumption: because "master" is older.(?)
I think it works locally because the command uses the reflog in addition(!), however, it should work without the local reflog as well. (since the history was not modified in any way)
BR, Jakob
next parent reply other threads:[~2017-09-13 15:07 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 ` Ekelhart Jakob [this message]
2017-09-14 8:09 ` merge-base not working as expected when base is ahead 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
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=e697e5f0da0845ee92ffdb88a4fa48d9@SFSWW2K12EX02.intern.fsw.at \
--to=jakob.ekelhart@fsw.at \
--cc=git@vger.kernel.org \
--cc=matthias.lischka@fsw.at \
/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).