Hi Phillip, On 22/02/2022 18:55, Phillip Wood wrote: > Hi Philip > > On 22/02/2022 10:33, Johannes Schindelin via GitGitGadget wrote: >> This small update to the die() preserve-merges messages is a response >> to the >> reported edge case in the Git-for-Windows googlegroups thread >> [https://groups.google.com/g/git-for-windows/c/3jMWbBlXXHM] where >> even git >> rebase --continue would die. >> >> It is most relevant for Windows because Visual Studio still offers the >> option to run git pull --preserve, therefore Git for Windows already >> applied >> these patches. The improvements are not specific to Windows, though, and >> should therefore also get into core Git, albeit at a more leisurely >> pace. > > I think the new messages are an improvement, I was wondering how > difficult it would be to allow the user to run rebase --abort so they > can at least easily start again with --rebase-merges. In this case, the user (another Phillip), couldn't run `rebase --continue` without getting a `fatal:` report. A code inspection showed that was one of the first tests so I don't believe they could run `--quit` or `abort` either! We eventually nailed it down to being an update of Git, after getting into a bad conflict resolution, so the update refused to do any rebase commands! Later they tried downgrading and finishing the rebase that way in the usual 'hack & hope' way. Luckily they had a backup from the time of the update, which was able to confirm the presence of the indicative directory (which is an implementation detail). If the `rebase abort` was moved earlier in the code, then it might work, but we'd still need to keep the clean-up code for a non-existent option, which is less than ideal . Philip > > Best Wishes > > Phillip > >> This is a companion patch series to >> https://github.com/git-for-windows/git/pull/3708 >> >> Philip Oakley (2): >> rebase: help user when dying with preserve-merges` >> rebase: `preserve` is also a pull option, tell dying users >> >> builtin/rebase.c | 9 +++++++-- >> 1 file changed, 7 insertions(+), 2 deletions(-) >> >> >> base-commit: e6ebfd0e8cbbd10878070c8a356b5ad1b3ca464e >> Published-As: >> https://github.com/gitgitgadget/git/releases/tag/pr-1155%2Fdscho%2Fdie_preserve-v1 >> Fetch-It-Via: git fetch https://github.com/gitgitgadget/git >> pr-1155/dscho/die_preserve-v1 >> Pull-Request: https://github.com/gitgitgadget/git/pull/1155 >
