Re: [PATCH/RFC v2] sequencer.c: record revert/cherry-pick commit with trailer lines

From: Duy Nguyen <pclouds@gmail.com>
Date: Nov 5, 2018, 16:08 UTC
Message-ID: <CACsJy8AJY=J=YF1w-aWZkMYeNa9R05ThAqka7vDFNpvre5TB0g@mail.gmail.com>
In-Reply-To: <20181104213007.GL731755@genre.crustytoothpaste.net>

On Sun, Nov 4, 2018 at 10:30 PM brian m. carlson <sandals@crustytoothpaste.net> wrote:

Show 5 quoted lines

> However, I do have concerns about breaking compatibility with existing
> scripts.  I wonder if we could add a long alias for git cherry-pick -x,
> say "--notate" and have "--notate=text" mean "-x" and "--notate=trailer"
> mean this new format.  Similarly, git revert could learn such an option
> as well.

I don't think it will help unless you are the only developer on some repo. If you have some scripts parsing the old format, people could choose to commit using the new format anyway and your scripts will have to adapt (it's too late to revert because it's already part of git history).

The transition plan could be outputing both old and new formats at the same time (optionally allowing to disable the old one) and leave it like that for a couple releases. Then we could stop producing the old output and hope that all the scripts in the world have caught up. Not a great plan.

> One final thought: since our trailers seem to act as if we wrote "this
> commit" (has been), I wonder if we should say "Reverts" instead of
> "Revert" for consistency.

Yeah that or Reverting:, both are better than Revert:. I guess I'll just go with Reverts: if this patch moves forward.

-- 
Duy