Hi Phillip,
'git stash create autostash' does not clear the workarea (like 'git stash' does)
That's the reason for the 'git reset --hard'
The difference you see in the test between the legacy rebase and the builtin
rebase is because
the legacy 'git reset --hard' emits the 'HEAD is now at ...' wh
Hi Ben
I need to have a longer look at this (I don't understand why we're
calling reset --hard after we've stashed the changes) but I notice that
the test lines you're changing predate the switch to the builtin rebase
so those changes are not related to the branch switching problem.
Best Wis
The rebase --autostash incorrectly moved the current branch to orig_head, where
orig_head -- commit object name of tip of the branch before rebasing
It seems this was incorrectly taken over from git-legacy-rebase.sh
Signed-off-by: Ben Wijen
---
builtin/rebase.c| 18 ++---
3 matches
Mail list logo