On Fri, Oct 19, 2018 at 03:02:22PM +0900, Junio C Hamano wrote: > Two large set of topics on "rebase in C" and "rebase -i in C" are > now in 'next'.
I see occasional failures in 't5520-pull.sh': expecting success: test_config rebase.autostash true && test_pull_autostash --rebase + test_config rebase.autostash true + config_dir= + test rebase.autostash = -C + test_when_finished test_unconfig 'rebase.autostash' + test 0 = 0 + test_cleanup={ test_unconfig 'rebase.autostash' } && (exit "$eval_ret"); eval_ret=$?; : + git config rebase.autostash true + test_pull_autostash --rebase + git reset --hard before-rebase HEAD is now at 12212b3 new file + echo dirty + git add new_file + git pull --rebase . copy >From . * branch copy -> FETCH_HEAD Created autostash: 5417697 HEAD is now at 12212b3 new file First, rewinding head to replay your work on top of it... Applying: new file Applying autostash resulted in conflicts. Your changes are safe in the stash. You can run "git stash pop" or "git stash drop" at any time. + test_cmp_rev HEAD^ copy + git rev-parse --verify HEAD^ + git rev-parse --verify copy + test_cmp expect.rev actual.rev + diff -u expect.rev actual.rev + cat new_file cat: new_file: No such file or directory + test = dirty error: last command exited with $?=1 not ok 25 - pull --rebase succeeds with dirty working directory and rebase.autostash set When running t5520 in a loop, it tends to fail between 10-40 iterations, even when the machine is not under heavy load. It appears that these failures started with commit 5541bd5b8f (rebase: default to using the builtin rebase, 2018-08-08), i.e. tip of 'pk/rebase-in-c-6-final', but it's a "flip the big switch" commit, so not very useful...