On Sat, Apr 2, 2016 at 1:58 PM, Mehul Jain <mehul.jain2...@gmail.com> wrote:
> "--[no-]autostash" option for git-pull is only valid in rebase mode(
s/"--[no-]autostash"/The --[no-]autostash/
Also, move the '(' from the end of the line to the beginning of the next line.
> i.e. either --rebase should be used or pull.rebase=true). Existing
> tests already check the cases when --rebase is used but fails to check
> for pull.rebase=true case.
>
> Add two new tests to check that --[no-]autostash option works with
> pull.rebase=true.
Nicely explained.
> Signed-off-by: Mehul Jain <mehul.jain2...@gmail.com>
> ---
> t/t5520-pull.sh | 10 ++++++++++
> 1 file changed, 10 insertions(+)
>
> diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh
> index e12af96..bed75f5 100755
> --- a/t/t5520-pull.sh
> +++ b/t/t5520-pull.sh
> @@ -314,6 +314,16 @@ test_expect_success 'pull.rebase' '
> test new = "$(git show HEAD:file2)"
> '
>
> +test_expect_success 'pull --autostash & pull.rebase=true' '
> + test_config pull.rebase true &&
> + test_pull_autostash --autostash
> +'
> +
> +test_expect_success 'pull --no-autostash & pull.rebase=true' '
> + test_config pull.rebase true &&
> + test_pull_autostash_fail --no-autostash
> +'
> +
> test_expect_success 'branch.to-rebase.rebase' '
> git reset --hard before-rebase &&
> test_config branch.to-rebase.rebase true &&
> --
> 2.7.1.340.g69eb491.dirty
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
