From: Paul Tan <pyokagan@gmail.com>
Date: Tue, 07 Jul 2015 08:23:18 GMT
Subject: Re: [PATCH v4 27/44] builtin-am: implement --[no-]scissors
Message-ID: <CACRoPnR1kJVg-SKGJggc-gWAtDVoeyRG6G8SHx7T7XNUMyGozw@mail.gmail.com>
In-Reply-To: <1435500366-31700-28-git-send-email-pyokagan@gmail.com>

On Sun, Jun 28, 2015 at 10:05 PM, Paul Tan <pyokagan@gmail.com> wrote:
> diff --git a/builtin/am.c b/builtin/am.c
> index 2387726..55989e5 100644
> --- a/builtin/am.c
> +++ b/builtin/am.c
> @@ -74,6 +74,12 @@ enum keep_type {
>         KEEP_NON_PATCH  /* pass -b flag to git-mailinfo */
>  };
>
> +enum scissors_type {
> +       SCISSORS_UNSET = -1,
> +       SCISSORS_TRUE,  /* pass --scissors to git-mailinfo */
> +       SCISSORS_FALSE  /* pass --no-scissors to git-mailinfo */
> +};
> +

Heh, the improved test coverage[1] caught a bug here. Whooops.

[1] http://thread.gmane.org/gmane.comp.version-control.git/273254/focus=273264

Regards,
Paul