Re: What's cooking in git.git (Oct 2018, #04; Fri, 19)

[Alban Gruin <alban.gruin@gmail.com>]

Hi,

Le 19/10/2018 à 14:46, SZEDER Gábor a écrit :
> 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':
> 
> […]
>
> 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...
> 

I can reproduce this.

I also tried to run this specific test under valgrind, and found out
that some cases I did not targeted with --valgrind-only failed.  The
same thing happens with t3404, which did not crash with valgrind before.

Here is a log:

> expecting success: 
>         HEAD=$(git rev-parse HEAD) &&
>         set_fake_editor &&
>         git rebase -i -p HEAD^ &&
>         git update-index --refresh &&
>         git diff-files --quiet &&
>         git diff-index --quiet --cached HEAD -- &&
>         test $HEAD = $(git rev-parse HEAD)
> 
> +++ git rev-parse HEAD
> ++ HEAD=d2d5ba71c6d0266f26238e804f77f026984ae0d9
> ++ set_fake_editor
> ++ write_script fake-editor.sh
> ++ echo '#!/bin/sh'
> ++ cat
> ++ chmod +x fake-editor.sh
> +++ pwd
> ++ test_set_editor '/tmp/git-alban/trash directory.t3404-rebase-interactive/fake-editor.sh'
> ++ FAKE_EDITOR='/tmp/git-alban/trash directory.t3404-rebase-interactive/fake-editor.sh'
> ++ export FAKE_EDITOR
> ++ EDITOR='"$FAKE_EDITOR"'
> ++ export EDITOR
> ++ git rebase -i -p 'HEAD^'
> GIT_DIR='/tmp/git-alban/trash directory.t3404-rebase-interactive/.git'; state_dir='.git/rebase-merge'; upstream_name='HEAD^'; upstream='8f99a4f1fbbd214b25a070ad34ec5a8f833522cc'; head_name='refs/heads/branch1'; orig_head='d2d5ba71c6d0266f26238e804f77f026984ae0d9'; onto='8f99a4f1fbbd214b25a070ad34ec5a8f833522cc'; onto_name='HEAD^'; unset revisions; unset restrict_revision; GIT_QUIET=''; git_am_opt=''; verbose=''; diffstat=''; force_rebase=''; action=''; signoff=''; allow_rerere_autoupdate=''; keep_empty=''; autosquash=''; unset gpg_sign_opt; unset cmd; allow_empty_message='--allow-empty-message'; rebase_merges=''; rebase_cousins=''; unset strategy; unset strategy_opts; rebase_root=''; squash_onto=''; git_format_patch_opt=''; . git-sh-setup && . git-rebase--common && . git-rebase--preserve-merges && git_rebase__preserve_merges: line 0: .: git-rebase--common: file not found
> error: last command exited with $?=1
> not ok 25 - -p handles "no changes" gracefully
> #
> #               HEAD=$(git rev-parse HEAD) &&
> #               set_fake_editor &&
> #               git rebase -i -p HEAD^ &&
> #               git update-index --refresh &&
> #               git diff-files --quiet &&
> #               git diff-index --quiet --cached HEAD -- &&
> #               test $HEAD = $(git rev-parse HEAD)
> #

This comes from 't3404-rebase-interactive.sh', with --valgrind-only set
to '63'.

Cheers,
Alban