Re: [PATCH] rebase -i: fixup fixup! fixup!

From: Junio C Hamano <gitster@pobox.com>
Date: Jun 27, 2013, 20:52 UTC
Message-ID: <7vr4fnqnse.fsf@alter.siamese.dyndns.org>
In-Reply-To: <1372359783-sup-4507@pimlott.net>

Andrew Pimlott <andrew@pimlott.net> writes:

> Updated for recommended here-doc style.

Thanks.

Show 22 quoted lines

> +test_auto_fixup_fixup () {
> +	git reset --hard base &&
> +	echo 1 >file1 &&
> +	git add -u &&
> +	test_tick &&
> +	git commit -m "$1! first" &&
> +	echo 2 >file1 &&
> +	git add -u &&
> +	test_tick &&
> +	git commit -m "$1! $2! first" &&
> +	git tag "final-$1-$2" &&
> +	test_tick &&
> +	(
> +		set_cat_todo_editor &&
> +		test_must_fail git rebase --autosquash -i HEAD^^^^ >actual &&
> +		cat >expected <<EOF
> +pick $(git rev-parse --short HEAD^^^) first commit
> +$1 $(git rev-parse --short HEAD^) $1! first
> +$1 $(git rev-parse --short HEAD) $1! $2! first
> +pick $(git rev-parse --short HEAD^^) second commit
> +EOF
> +		test_cmp expected actual

Two issues here, which I'll locally amend (no need to resend):

		cat >expected <<-EOF &&
		pick ...
		...
                EOF
		test_cmp expected actual