Re: [PATCH 3/4] rebase: Update `--empty=ask` to `--empty=drop`

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi Brian

On 19/01/2024 05:59, brianmlyles@xxxxxxxxx wrote:
From: Brian Lyles <brianmlyles@xxxxxxxxx>

When `git-am` got its own `--empty` option in 7c096b8d61 (am: support
--empty=<option> to handle empty patches, 2021-12-09), `stop` was used
instead of `ask`. `stop` is a more accurate term for describing what
really happens,

I can see your reasoning but I think of stopping as git's way of asking what to do so I'm not sure if "stop" is better than "ask". I don't know how we ended up with two different terms - the prior art is "ask" so maybe we should change "am --empty" instead. Lets see what others think.

It would be helpful to mention the tests in the commit message - we end up with a mixture of "--empty=ask" and "--empty=stop" I assume that is by design

and consistency is good. This commit updates
`git-rebase` to also use `stop`, while keeping `ask` as a deprecated
synonym.

If we're deprecating "ask" do we want to print a warning recommending "stop" instead?

Best Wishes

Phillip




[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux