From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 26 Aug 2020 21:41:19 GMT
Subject: Re: [PATCH v8 3/5] rebase -i: support --committer-date-is-author-date
Message-ID: <xmqqv9h5t79c.fsf@gitster.c.googlers.com>
In-Reply-To: <20200817174004.92455-4-phillip.wood123@gmail.com>

Phillip Wood <phillip.wood123@gmail.com> writes:

> diff --git a/t/t3436-rebase-more-options.sh b/t/t3436-rebase-more-options.sh
> index 4f8a6e51c9..50a63d8ebe 100755
> --- a/t/t3436-rebase-more-options.sh
> +++ b/t/t3436-rebase-more-options.sh
> @@ -9,6 +9,9 @@ test_description='tests to ensure compatibility between am and interactive backe
>  
>  . "$TEST_DIRECTORY"/lib-rebase.sh
>  
> +GIT_AUTHOR_DATE="1999-04-02T08:03:20+05:30"
> +export GIT_AUTHOR_DATE
> +
>  # This is a special case in which both am and interactive backends
>  # provide the same output. It was done intentionally because
>  # both the backends fall short of optimal behaviour.
> @@ -21,11 +24,20 @@ test_expect_success 'setup' '
>  	test_write_lines "line 1" "new line 2" "line 3" >file &&
>  	git commit -am "update file" &&
> + ...
> +	mkdir test-bin &&
> +	write_script test-bin/git-merge-test <<-\EOF
> +	exec git-merge-recursive "$@"

This should be

	exec git merge-recursive "$@"

> +	EOF
>  '