From: Jay Soffian <jaysoffian@gmail.com>
Date: Wed, 16 Feb 2011 17:25:21 GMT
Subject: Re: [PATCH v2] Introduce CHERRY_PICK_HEAD
Message-ID: <AANLkTikNHJtWpZuZDKHrUDeGTqqEj-tzR2UbNXp98FOd@mail.gmail.com>
In-Reply-To: <1297876835-70613-1-git-send-email-jaysoffian@gmail.com>

On Wed, Feb 16, 2011 at 12:20 PM, Jay Soffian <jaysoffian@gmail.com> wrote:
> @@ -263,6 +279,11 @@ static void print_advice(void)
>
>        if (msg) {
>                fprintf(stderr, "%s\n", msg);
> +               /*
> +                * rebase interactive takes care of the authorship
> +                * when the user invokes rebase --continue
> +                */
> +               unlink(git_path("CHERRY_PICK_HEAD"));
>                return;
>        }
>
>

Oops, I amended the comment and then fed the wrong commit to
format-patch. That should be:

@@ -263,6 +279,11 @@ static void print_advice(void)

        if (msg) {
                fprintf(stderr, "%s\n", msg);
+               /*
+                * we're in the middle of an interactive rebase, we
+                * don't want it to look like we're cherry-picking.
+                */
+               unlink(git_path("CHERRY_PICK_HEAD"));
                return;
        }

Let me know if you want me to resend. (Sorry.)

j.