Re: [PATCH 1/2] t3404: demonstrate CHERRY_PICK_HEAD bug

From: Junio C Hamano <gitster@pobox.com>
Date: Jun 17, 2015, 17:33 UTC
Message-ID: <xmqqtwu66xzg.fsf@gitster.dls.corp.google.com>
In-Reply-To: <f76ca5d0b6687a4d2ee4f587d8ba75a643a33c04.1434528725.git.johannes.schindelin@gmx.de>

Johannes Schindelin <johannes.schindelin@gmx.de> writes:

Show 13 quoted lines

> +test_expect_failure 'rebase --continue removes CHERRY_PICK_HEAD' '
> +	git checkout -b commit-to-skip &&
> +	for double in X 3 1
> +	do
> +		seq 5 | sed "s/$double/&&/" >seq &&
> +		git add seq &&
> +		test_tick &&
> +		git commit -m seq-$double
> +	done &&
> +	git tag seq-onto &&
> +	git reset --hard HEAD~2 &&
> +	git cherry-pick seq-onto &&
> +	test_must_fail git rebase -i seq-onto &&

Shouldn't this explicitly specify what fake editor is to be used, instead of relying on whatever the last test happened to have used?

I thought this deserved to go to older maintenance track, but the fake editor that was used last are different between branches, so "rebase -i" fails for a wrong reason (i.e. cannot spawn the editor) when queued on say maint-2.2.

> +	test -d .git/rebase-merge &&
> +	git rebase --continue &&
> +	git diff seq-onto &&

I am puzzled with this "diff"; what is this about? Is it a remnant from an earlier debugging session, or is it making sure seq-onto is a valid tree-ish?

Show 5 quoted lines

> +	test ! -d .git/rebase-merge &&
> +	test ! -f .git/CHERRY_PICK_HEAD
> +'
> +
>  test_done

Thanks.