Re: [PATCH] Fix git rebase --continue to work with touched files

From: Johannes Sixt <j6t@kdbg.org>
Date: Jul 27, 2010, 19:53 UTC
Message-ID: <201007272153.36646.j6t@kdbg.org>
In-Reply-To: <1280225198-4539-1-git-send-email-ddkilzer@kilzer.net>

On Dienstag, 27. Juli 2010, David D. Kilzer wrote:

Show 10 quoted lines

> +test_expect_success 'rebase --continue works with touched file' '
> +	count=1
> +	while test "$count" -le 4
> +	do
> +		git branch topic$count topic &&
> +		test_must_fail git rebase --onto master master topic$count &&
> +		echo "Resolved" >F2 &&
> +		git add F2 &&
> +		touch F1 &&
> +		git rebase --continue || exit 1

exit from a test is a big no-no. But I think you can reproduce the issue reliably and get rid of the entire loop if you use test-chmtime instead of touch:

		test-chmtime =-60 F1 &&

i.e. set the modification time back one minute.

Show 5 quoted lines

> +		count=$(($count + 1))
> +	done
> +'
> +
> +test_done

-- Hannes