Re: Regression in 'git pull --rebase --autostash' since v2.32.0

> Hello,
> 
> Philippe Blain wrote:
>> Your recent clean-up of 'git pull --autostash' seems to unfortunately have made things
>> worse if the pull brings new files that conflict with existing untracked files,
>> which makes the pull abort,
>> and there are tracked files with modifications (so --autostash comes into play).
>>
>> Before your change, 'git pull --no-rebase --autostash' did *not* apply the autostash
>> after the pull failed, thus loosing modifications to tracked files (and it did not save the
>> stash entry !). 'git pull --rebase --autostash' correctly applied the autostash, but ended with
>> a strange "error: could not detach HEAD".
>>
>> After your change, both 'git pull --no-rebase --autostash' and 'git pull --rebase --autostash'
>> have the same buggy behaviour: they do not apply the autostash and do not save it in the stash list.
>>
>> I had already documented the old behaviour at [1]. Here, I copy my reproducer script
>> (save it as "script"):
> 
> I cannot reproduce this. In my case the reproducer script never puts
> anything in the stash list.

> ** ./script --rebase --autostash **
> 
> ~~~
> + git status
> On branch master
> Your branch is up to date with 'origin/master'.
> 
> Changes not staged for commit:
>   (use "git add <file>..." to update what will be committed)
>   (use "git restore <file>..." to discard changes in working directory)
>     modified:   file
> 
> Untracked files:
>   (use "git add <file>..." to include in what will be committed)
>     other
> 
> no changes added to commit (use "git add" and/or "git commit -a")
> + git pull --rebase --autostash
> remote: Enumerating objects: 4, done.
> remote: Counting objects: 100% (4/4), done.
> remote: Compressing objects: 100% (2/2), done.
> remote: Total 3 (delta 0), reused 0 (delta 0), pack-reused 0
> Unpacking objects: 100% (3/3), 283 bytes | 94.00 KiB/s, done.
> From /Users/Philippe/Code/GIT-devel/BUGS/ggg-759-pull-autotash-untracked/test
>    4ebab2f..fc7a169  master     -> origin/master
> Updating 4ebab2f..fc7a169
> Created autostash: cfd51b5
> error: The following untracked working tree files would be overwritten by merge:
>     other
> Please move or remove them before you merge.
> Aborting

> + git status
> On branch master
> Your branch is behind 'origin/master' by 1 commit, and can be fast-forwarded.
>   (use "git pull" to update your local branch)
> 
> Untracked files:
>   (use "git add <file>..." to include in what will be committed)
>     other
> 
> nothing added to commit but untracked files present (use "git add" to track)
> + git stash list
> # empty!
> ~~~ 

> 
> Moreover, this is not an issue of `git pull`, but `git merge`.
> 
> I can reproduce the problem that the modifications are lost like this:
> 
>    git init test
>    (
>      cd test
>      date >> file
>      git add file
>      git commit -m 'add file'
>      date >> other
>      git add other
>      git commit -m 'add other'
>      git checkout -b topic @~
>      date >> other
>      date >> file
>      git status
>      git "$@" master
>      git status
>      git stash list
>    )
> 
> Running this with 'rebase --autostash' fails and nothing is put in the
> stash list, but the modifications to 'file' remain. I think this is the
> correct behavior.