From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Christian Couder <chriscool@tuxfamily.org>
Cc: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Subject: Re: [RFC/PATCH 3/4] revert: allow cherry-picking a range of commits
Date: Sat, 29 May 2010 17:47:10 +0200 (CEST) [thread overview]
Message-ID: <alpine.DEB.1.00.1005291743300.1638@bonsai2> (raw)
In-Reply-To: <20100529044044.569.7874.chriscool@tuxfamily.org>
Hi,
On Sat, 29 May 2010, Christian Couder wrote:
> diff --git a/builtin/revert.c b/builtin/revert.c
> index 70372dc..c281a80 100644
> --- a/builtin/revert.c
> +++ b/builtin/revert.c
> @@ -545,6 +542,40 @@ static int revert_or_cherry_pick(int argc, const char **argv)
> if (read_cache() < 0)
> die("git %s: failed to read the index", me);
>
> + dotdot = strstr(commit_name, "..");
> + if (dotdot) {
> + struct rev_info revs;
> + const char *argv[4];
> + int argc = 0;
> +
> + argv[argc++] = NULL;
> + if (action != REVERT)
> + argv[argc++] = "--reverse";
> + argv[argc++] = commit_name;
> + argv[argc++] = NULL;
Maybe "--no-merges"?
> + init_revisions(&revs, NULL);
> + setup_revisions(argc - 1, argv, &revs, NULL);
> + if (prepare_revision_walk(&revs))
> + die("revision walk setup failed");
> +
> + if (!revs.commits)
> + die("empty range passed");
> +
> + while ( (commit = get_revision(&revs)) ) {
The style more in linet with the rest of the source code would be:
while ((commit = get_revision(&revs))) {
The rest of the patch series looks very, very good to me. I totally agree
that we do not have to implement the --abort and --continue for now, as
well as the HEAD-detaching business we're used to from rebase and am.
Thanks,
Dscho
next prev parent reply other threads:[~2010-05-29 15:47 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-29 4:40 [RFC/PATCH 0/4] implement "git cherry-pick A..B" Christian Couder
2010-05-29 4:40 ` [RFC/PATCH 1/4] revert: use run_command_v_opt() instead of execv_git_cmd() Christian Couder
2010-05-29 4:40 ` [RFC/PATCH 2/4] revert: refactor code into a do_pick_commit() function Christian Couder
2010-05-30 11:19 ` Ramkumar Ramachandra
2010-05-30 20:07 ` Jonathan Nieder
2010-05-30 20:29 ` Christian Couder
2010-05-29 4:40 ` [RFC/PATCH 3/4] revert: allow cherry-picking a range of commits Christian Couder
2010-05-29 15:27 ` Junio C Hamano
2010-05-30 6:41 ` Christian Couder
2010-05-29 15:47 ` Johannes Schindelin [this message]
2010-05-30 6:45 ` Christian Couder
2010-06-01 3:12 ` Christian Couder
2010-05-29 4:40 ` [RFC/PATCH 4/4] revert: add tests to check " Christian Couder
2010-05-29 13:12 ` [RFC/PATCH 0/4] implement "git cherry-pick A..B" Sverre Rabbelier
2010-05-30 7:41 ` 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=alpine.DEB.1.00.1005291743300.1638@bonsai2 \
--to=johannes.schindelin@gmx.de \
--cc=chriscool@tuxfamily.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