On Sat, Apr 2, 2016 at 1:58 PM, Mehul Jain <mehul.jain2...@gmail.com> wrote:
> t5520: factor out common code
To distinguish this title from that of patch 4/7, you could say:
t5520: factor out common "failing autostash" code
> Three tests contains repetitive lines of code.
>
> Factor out common code into test_pull_autostash_fail() and then call it in
> these tests.
>
> Helped-by: Eric Sunshine <sunsh...@sunshineco.com>
> Signed-off-by: Mehul Jain <mehul.jain2...@gmail.com>
> ---
> diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh
> @@ -19,6 +19,14 @@ test_pull_autostash () {
> +test_pull_autostash_fail () {
> + git reset --hard before-rebase &&
> + echo dirty >new_file &&
> + git add new_file &&
> + test_must_fail git pull $@ . copy 2>err &&
Nit: Same comment as in 4/7: This could just as well be $* rather than $@.
> + test_i18ngrep "uncommitted changes." err
> +}
> @@ -277,29 +285,17 @@ test_expect_success 'pull --rebase --autostash &
> rebase.autostash unset' '
>
> test_expect_success 'pull --rebase --no-autostash & rebase.autostash=true' '
> test_config rebase.autostash true &&
> - git reset --hard before-rebase &&
> - echo dirty >new_file &&
> - git add new_file &&
> - test_must_fail git pull --rebase --no-autostash . copy 2>err &&
> - test_i18ngrep "Cannot pull with rebase: Your index contains
> uncommitted changes." err
> + test_pull_autostash_fail --rebase --no-autostash
> '
>
> test_expect_success 'pull --rebase --no-autostash & rebase.autostash=false' '
> test_config rebase.autostash false &&
> - git reset --hard before-rebase &&
> - echo dirty >new_file &&
> - git add new_file &&
> - test_must_fail git pull --rebase --no-autostash . copy 2>err &&
> - test_i18ngrep "Cannot pull with rebase: Your index contains
> uncommitted changes." err
> + test_pull_autostash_fail --rebase --no-autostash
> '
>
> test_expect_success 'pull --rebase --no-autostash & rebase.autostash unset' '
> test_unconfig rebase.autostash &&
> - git reset --hard before-rebase &&
> - echo dirty >new_file &&
> - git add new_file &&
> - test_must_fail git pull --rebase --no-autostash . copy 2>err &&
> - test_i18ngrep "Cannot pull with rebase: Your index contains
> uncommitted changes." err
> + test_pull_autostash_fail --rebase --no-autostash
> '
>
> test_expect_success 'pull --autostash (without --rebase) should error out' '
> --
> 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
