From: Jeff King <peff@peff.net>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: Junio C Hamano <junkio@cox.net>, git@vger.kernel.org
Subject: Re: [PATCH] add receive.denyNonFastforwards config variable
Date: Thu, 21 Sep 2006 01:52:53 -0400 [thread overview]
Message-ID: <20060921055252.GA29479@coredump.intra.peff.net> (raw)
In-Reply-To: <Pine.LNX.4.63.0609210211570.19042@wbgn013.biozentrum.uni-wuerzburg.de>
On Thu, Sep 21, 2006 at 02:17:22AM +0200, Johannes Schindelin wrote:
> So we indeed assumed that git-merge-base returns the old commit in the
> case of a fast-forward (git-merge-base returns just the first item of the
> result of get_merge_bases()).
>
> Note that I have no proof that this assumption is true. It might be wrong
> in this case:
>
> X - a - b - c - Y
> / /
> o - d - e - f
In your example, git-merge-base X Y returns X. In fact, I could only get
one merge base out of git-merge-base --all. I tried looking in the tests
to find a case that produced multiple merge bases, but I was unable to
find one. Is there an example floating around somewhere?
-Peff
next prev parent reply other threads:[~2006-09-21 5:52 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-09-20 22:28 [PATCH] add receive.denyNonFastforwards config variable Johannes Schindelin
2006-09-20 22:44 ` Junio C Hamano
2006-09-20 22:46 ` Shawn Pearce
2006-09-20 23:07 ` Johannes Schindelin
2006-09-20 23:19 ` Junio C Hamano
2006-09-21 0:10 ` Johannes Schindelin
2006-09-21 6:26 ` Junio C Hamano
2006-09-21 9:10 ` Johannes Schindelin
2006-09-20 23:38 ` Junio C Hamano
2006-09-21 0:17 ` Johannes Schindelin
2006-09-21 5:08 ` Junio C Hamano
2006-09-21 5:52 ` Jeff King [this message]
2006-09-21 6:43 ` Junio C Hamano
2006-09-21 9:08 ` Johannes Schindelin
2006-09-21 9:25 ` Junio C Hamano
2006-09-20 23:45 ` Jeff King
2006-09-21 0:07 ` Johannes Schindelin
2006-09-21 5:35 ` Junio C Hamano
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=20060921055252.GA29479@coredump.intra.peff.net \
--to=peff@peff.net \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=junkio@cox.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox