Hi Johannes, Le 26/01/2020 à 11:04, Johannes Schindelin a écrit : > Hi Alban, > > On Sat, 25 Jan 2020, Alban Gruin wrote: > >> Changes since v4: >> >> - Added a test to check that no errors are raised when editing the todo >> list after pausing the rebase; it was provided by Phillip Wood. >> >> - Fixed the issue pointed out by this test by creating a backup of the >> todo list even if the edited list is incorrect. This step was moved >> before the user edits the list, so the backup can be created with >> copy_file() instead of todo_list_write_to_file(). > > Please note that I changed this to always use `todo_list_write_to_file()` > in `js/rebase-i-with-colliding-hash` (see e.g. > https://github.com/gitgitgadget/git/commit/26027625). > > The reason is that the copy would be made with _abbreviated_ commit IDs. > And during the rebase, those abbreviated IDs could become non-unique. > > I have to admit that I did not follow the evolution of your patch series > terribly closely, but from your description I gather that we want to be > careful to ensure that the `.backup` file is written with non-abbreviated > commit IDs always. > > The way I read your patches, they will conflict with > `js/rebase-i-with-colliding-hash`, so maybe it would be a good idea to > base your patches on that branch? > Let's do this. This will also solve the conflict this series already has with master. > Thanks, > Dscho > Cheers, Alban
