From: Michael J Gruber <git@drmicha•warpmail.net>
To: Junio C Hamano <gitster@pobox•com>
Cc: git@vger•kernel.org
Subject: Re: What's cooking in git.git (Feb 2011, #07; Mon, 28)
Date: Sat, 05 Mar 2011 18:04:26 +0100 [thread overview]
Message-ID: <4D726D1A.50507@drmicha.warpmail.net> (raw)
In-Reply-To: <7vbp1vfy5f.fsf@alter.siamese.dyndns.org>
Junio C Hamano venit, vidit, dixit 01.03.2011 02:05:
...
> * mg/rev-list-one-side-only (2011-02-22) 6 commits
> - t6007: test rev-list --cherry
> - log --cherry: a synonym
> - rev-list: --left/right-only are mutually exclusive
> - rev-list: documentation and test for --left/right-only
> - t6007: Make sure we test --cherry-pick
> - revlist.c: introduce --left/right-only for unsymmetric picking
>
> Will merge to 'next'; somebody may want to try losing many lines from
> format-patch before it hits 'master', though. Hint, hint...
I was looking at f-p and also cherry, and getting second thoughts on
"--cherry" in the course of it. Would you hold back the top 2, please?
I'm wondering whether we should make "rev-list --cherry" more close to
"cherry" (which also takes up your suggestion to show equivalent
commits). With the top 2, "--cherry" lists the "+" commits only.
I'm thinking of something like "--cherry-mark" which is like
--cherry-pick but marks equivalent commits (with a new flag PATCHSAME)
rather than dropping them. Then,
git rev-list --cherry-pick --no-merges --left-right --right-only A...B
would be equivalent to
git cherry A B
but would make a lot of sense without --right-only, as well.
I have a monkey patch for that right now (to be polished) which uses "="
because "-" is taken for boundary commits already. (I also noticed "^"
for UNINTERESTING - when do they get shown??) I'm wondering about the
relation between --cherry-mark and --left-right though: Should the
former imply the latter, or should --cherry-mark always output '='? I
guess the latter.
If we were/are open to changing the characters which "git cherry" uses
as markers we could probably replace it by the invocation above. The
alternative (overload the meaning of '-') does not look like the best
solution.
Michael
prev parent reply other threads:[~2011-03-05 17:04 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-01 1:05 What's cooking in git.git (Feb 2011, #07; Mon, 28) Junio C Hamano
2011-03-01 7:59 ` Jens Lehmann
2011-03-01 8:39 ` Erik Faye-Lund
2011-03-01 17:50 ` Junio C Hamano
2011-03-02 6:49 ` Johannes Sixt
2011-03-02 18:22 ` Erik Faye-Lund
2011-03-02 18:28 ` Erik Faye-Lund
2011-03-05 17:04 ` Michael J Gruber [this message]
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=4D726D1A.50507@drmicha.warpmail.net \
--to=git@drmicha$(echo .)warpmail.net \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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