From: Junio C Hamano <junkio@cox.net>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] add receive.denyNonFastforwards config variable
Date: Wed, 20 Sep 2006 16:38:05 -0700 [thread overview]
Message-ID: <7vlkoeds82.fsf@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: <Pine.LNX.4.63.0609210107140.19042@wbgn013.biozentrum.uni-wuerzburg.de> (Johannes Schindelin's message of "Thu, 21 Sep 2006 01:07:54 +0200 (CEST)")
Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
> No longer barfs on new refs, and tries all merge bases (even if I
> cannot come up with any scenario where there is more than one merge
> base in the case of a fast forward).
Hmm. If that is the case (and I think it is although I haven't
come up with a proof), the test can be written like this:
if (bases && !bases->next &&
hashcmp(old_sha1, bases->item->object.sha1))
; /* happy */
else
return error("not a fast forward");
perhaps?
next prev parent reply other threads:[~2006-09-20 23:38 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 [this message]
2006-09-21 0:17 ` Johannes Schindelin
2006-09-21 5:08 ` Junio C Hamano
2006-09-21 5:52 ` Jeff King
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=7vlkoeds82.fsf@assigned-by-dhcp.cox.net \
--to=junkio@cox.net \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox