From: Yuval Kogman <nothingmuch@woobling.org>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] Add --ff-only flag to git-merge
Date: Thu, 29 Jan 2009 22:57:43 +0200 [thread overview]
Message-ID: <a891e1bd0901291257t774af061s84497cde8f4bf61c@mail.gmail.com> (raw)
In-Reply-To: <7vk58fm8x2.fsf@gitster.siamese.dyndns.org>
Hi,
I started incorperating your feedback but before I send a new patch I
have several questions about the trickier bits:
2009/1/28 Junio C Hamano <gitster@pobox.com>:
> * The placement of this misses the case where a merge of two unrelated
> histories is attempted. You would need to also have a check at "No
> common ancestors found. We need a real merge." part.
Won't that fall through? The if (!common) is above, and this is
eventually an else if for it (see line 978)
> The octopus
> codepath could also end up with a fast forward or up-to-date.
So this case is obviously more convoluted... If an octopus merge is
chosen should it just pass --ff-only to git-merge-octopus? Or maybe it
should always pass --ff-only and the various different strategies
would just die unconditionally?
next prev parent reply other threads:[~2009-01-29 20:59 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-28 12:53 [PATCH] Add --ff-only flag to git-merge Yuval Kogman
2009-01-28 13:26 ` Johannes Schindelin
2009-01-28 13:29 ` Yuval Kogman
2009-01-28 14:35 ` Sverre Rabbelier
2009-01-28 21:12 ` Junio C Hamano
2009-01-29 20:57 ` Yuval Kogman [this message]
2009-01-29 22:29 ` Junio C Hamano
2009-01-30 4:32 ` [PATCH] Add --ff-only flag to git-merge (take 2) Yuval Kogman
2009-01-30 4:32 ` [PATCH] Add --ff-only flag to git-merge Yuval Kogman
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=a891e1bd0901291257t774af061s84497cde8f4bf61c@mail.gmail.com \
--to=nothingmuch@woobling.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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;
as well as URLs for NNTP newsgroup(s).