From: Junio C Hamano <gitster@pobox.com>
To: Christian Couder <chriscool@tuxfamily.org>
Cc: git@vger.kernel.org,
Linus Torvalds <torvalds@linux-foundation.org>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Stephan Beyer <s-beyer@gmx.net>,
Daniel Barkalow <barkalow@iabervon.org>,
Paolo Bonzini <bonzini@gnu.org>,
Stephen Boyd <bebarino@gmail.com>
Subject: Re: [PATCH v4 3/7] revert: add --ff option to allow fast forward when cherry-picking
Date: Sat, 06 Mar 2010 19:55:23 -0800 [thread overview]
Message-ID: <7v6358dbv8.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <20100306203447.2960.42019.chriscool@tuxfamily.org> (Christian Couder's message of "Sat\, 06 Mar 2010 21\:34\:42 +0100")
Christian Couder <chriscool@tuxfamily.org> writes:
> From: Junio C Hamano <gitster@pobox.com>
>
> As "git merge" fast forwards if possible, it seems sensible to
> have such a feature for "git cherry-pick" too, especially as it
> could be used in git-rebase--interactive.sh.
>
> Maybe this option could be made the default in the long run,
I never said that.
For scripted use, like we can see in your [PATCH 7/7], "cherry-pick --ff"
could be a good ingredient (but even then the calling Porcelain script may
already know that what is being picked is a direct descendent (rebase -i
certainly should, as the last commit it processed from the todo file is at
the HEAD), but for manual use case it just feels silly to assume that the
end user is so stupid that s/he doesn't know the commit being picked might
be a direct descendant, which would be the only reason why making --ff the
default might make sense.
And adding --no-ff and sprinkling that to scripts, only to support that
default change as a future possibility, feels doubly silly.
What was the real motive/use case of "cherry-pick --ff"?
next prev parent reply other threads:[~2010-03-07 3:55 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-06 20:34 [PATCH v4 0/7] add --ff option to cherry-pick Christian Couder
2010-03-06 20:34 ` [PATCH v4 1/7] parse-options: add parse_options_concat() to concat options Christian Couder
2010-03-06 20:34 ` [PATCH v4 2/7] builtin/merge: make checkout_fast_forward() non static Christian Couder
2010-03-06 20:34 ` [PATCH v4 3/7] revert: add --ff option to allow fast forward when cherry-picking Christian Couder
2010-03-07 3:55 ` Junio C Hamano [this message]
2010-03-07 8:34 ` Paolo Bonzini
2010-03-07 9:05 ` Junio C Hamano
2010-03-07 20:39 ` Christian Couder
2010-03-06 20:34 ` [PATCH v4 4/7] cherry-pick: add tests for new --ff option Christian Couder
2010-03-06 20:34 ` [PATCH v4 5/7] Documentation: describe new cherry-pick " Christian Couder
2010-03-06 20:34 ` [PATCH v4 6/7] cherry-pick: add a no-op --no-ff option to future proof scripts Christian Couder
2010-03-06 20:34 ` [PATCH v4 7/7] rebase -i: use new --ff cherry-pick option Christian Couder
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=7v6358dbv8.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=barkalow@iabervon.org \
--cc=bebarino@gmail.com \
--cc=bonzini@gnu.org \
--cc=chriscool@tuxfamily.org \
--cc=git@vger.kernel.org \
--cc=s-beyer@gmx.net \
--cc=torvalds@linux-foundation.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;
as well as URLs for NNTP newsgroup(s).