Re: [PATCH v2] Introduce CHERRY_PICK_HEAD

[Jay Soffian <jaysoffian@xxxxxxxxx>]

On Wed, Feb 16, 2011 at 12:20 PM, Jay Soffian <jaysoffian@xxxxxxxxx> 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.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html