From: Elijah Newren Date: Thu, 02 Feb 2023 23:48:52 GMT Subject: Re: rebase --merge vs --whitespace=fix, was Re: [PATCH v5 00/10] rebase: fix several code/testing/documentation issues around flag incompatibilities Message-ID: In-Reply-To: <49581695-e072-ee3e-1748-f0b8112545ff@gmx.de> On Thu, Feb 2, 2023 at 2:29 AM Johannes Schindelin wrote: > > Hi Elijah, > > On Wed, 25 Jan 2023, Elijah Newren via GitGitGadget wrote: > > > We had a report about --update-refs being ignored when --whitespace=fix > > was passed, confusing an end user. These were already marked as > > incompatible in the manual, but the code didn't check for the > > incompatibility and provide an error to the user. > > Thank you for working on this! > > FWIW this report (and your patch series) made me wistful about that Google > Summer of Code project that I hoped would bring about the trick to combine > `--whitespace=fix` with interactive rebases. But in that GSoC project, > this goal was treated as a "bonus feature" and pushed so far back that we > did not even get to analyzing the complexity of the task, let alone any > details. > > So I sat down and started that analysis. The result is > https://github.com/gitgitgadget/git/issues/1472 where you can see that > addressing the incompatibility is definitely outside of trivial. It does > seem doable, if Outreachy/GSoC project-sized. Nice! Thanks for digging in and documenting what is needed!