From: Junio C Hamano <gitster@pobox.com>
To: Felipe Contreras <felipe.contreras@gmail.com>
Cc: git@vger.kernel.org, Martin von Zweigbergk <martinvonz@gmail.com>
Subject: Re: [PATCH 5/5] rebase: fix cherry-pick invocations
Date: Tue, 28 May 2013 15:51:41 -0700 [thread overview]
Message-ID: <7vvc62wwea.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <7vzjvewwne.fsf@alter.siamese.dyndns.org> (Junio C. Hamano's message of "Tue, 28 May 2013 15:46:13 -0700")
Junio C Hamano <gitster@pobox.com> writes:
> Felipe Contreras <felipe.contreras@gmail.com> writes:
>
>> So that all the tests pass.
>>
>> Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
>> ---
>> git-rebase--cherry.sh | 17 ++++++++++++++++-
>> 1 file changed, 16 insertions(+), 1 deletion(-)
>>
>> diff --git a/git-rebase--cherry.sh b/git-rebase--cherry.sh
>> index ca78b1b..c3a2ac9 100644
>> --- a/git-rebase--cherry.sh
>> +++ b/git-rebase--cherry.sh
>> @@ -23,11 +23,26 @@ test -n "$rebase_root" && root_flag=--root
>> mkdir "$state_dir" || die "Could not create temporary $state_dir"
>> : > "$state_dir"/cherry || die "Could not mark as cherry"
>>
>> +if test -n "$rebase_root"
>> +then
>> + revisions="$onto...$orig_head"
>> +else
>> + revisions="$upstream...$orig_head"
>> +fi
>
> "So that all the tests pass" needs a bit more explanation to say for
> cherry-pick codepath why and how two-dot range fails and why and how
> three-dot variant with --right-only fixes it. What are the problematic
> cases?
Yikes, sorry, this was me being slow. Walking A...B range with
right-only and --cherry applied will filter the duplicates, which is
wat you want, I think, and walking A..B range will not do the
filtering for you.
>> # we have to do this the hard way. git format-patch completely squashes
>> # empty commits and even if it didn't the format doesn't really lend
>> # itself well to recording empty patches. fortunately, cherry-pick
>> # makes this easy
>> -git cherry-pick --allow-empty "$revisions"
>> +if test -n "$keep_empty"
>> +then
>> + extra="--allow-empty"
>> +else
>> + extra="--skip-empty --cherry-pick"
>> +fi
>> +test -n "$GIT_QUIET" && extra="$extra -q"
>> +test -z "$force_rebase" && extra="$extra --ff"
>> +git cherry-pick --no-merges --right-only --topo-order --do-walk --copy-notes $extra "$revisions"
>> ret=$?
>>
>> if test 0 != $ret
next prev parent reply other threads:[~2013-05-28 22:51 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-28 13:29 [PATCH 0/5] rebase: improve the keep-empty Felipe Contreras
2013-05-28 13:29 ` [PATCH 1/5] rebase: split the cherry-pick stuff Felipe Contreras
2013-05-28 22:24 ` Junio C Hamano
2013-05-28 13:29 ` [PATCH 2/5] rebase: fix 'cherry' mode storage Felipe Contreras
2013-05-28 22:29 ` Junio C Hamano
2013-05-29 3:03 ` Felipe Contreras
2013-05-28 13:29 ` [PATCH 3/5] rebase: fix sequence continuation Felipe Contreras
2013-05-28 22:31 ` Junio C Hamano
2013-05-29 5:53 ` Felipe Contreras
2013-05-28 13:29 ` [PATCH 4/5] rebase: fix abort of cherry mode Felipe Contreras
2013-05-28 13:29 ` [PATCH 5/5] rebase: fix cherry-pick invocations Felipe Contreras
2013-05-28 22:46 ` Junio C Hamano
2013-05-28 22:51 ` Junio C Hamano [this message]
2013-05-29 5:57 ` Felipe Contreras
2013-05-29 5:55 ` Felipe Contreras
2013-05-28 13:33 ` [PATCH 0/5] rebase: improve the keep-empty Felipe Contreras
2013-05-28 17:17 ` Martin von Zweigbergk
2013-05-29 3:01 ` Felipe Contreras
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vvc62wwea.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=martinvonz@gmail.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).