On Sat, Apr 2, 2016 at 1:58 PM, Mehul Jain <[email protected]> wrote:
> t5520: factor out common code
To distinguish this title from that of patch 5/7, you could say:
t5520: factor out common "successful autostash" code
> Four tests contains repetitive lines of code.
>
> Factor out common code into test_pull_autostash() and then call it in
> these tests.
>
> Helped-by: Eric Sunshine <[email protected]>
> Signed-off-by: Mehul Jain <[email protected]>
> ---
> diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh
> @@ -9,6 +9,16 @@ modify () {
> +test_pull_autostash () {
> + git reset --hard before-rebase &&
> + echo dirty >new_file &&
> + git add new_file &&
> + git pull $@ . copy &&
Nit: This could just as well be $* rather than $@.
> + test_cmp_rev HEAD^ copy &&
> + test "$(cat new_file)" = dirty &&
> + test "$(cat file)" = "modified again"
> +}
> @@ -247,46 +257,22 @@ test_expect_success '--rebase fails with multiple
> branches' '
>
> test_expect_success 'pull --rebase succeeds with dirty working directory and
> rebase.autostash set' '
> test_config rebase.autostash true &&
> - git reset --hard before-rebase &&
> - echo dirty >new_file &&
> - git add new_file &&
> - git pull --rebase . copy &&
> - test_cmp_rev HEAD^ copy &&
> - test "$(cat new_file)" = dirty &&
> - test "$(cat file)" = "modified again"
> + test_pull_autostash --rebase
> '
>
> test_expect_success 'pull --rebase --autostash & rebase.autostash=true' '
> test_config rebase.autostash true &&
> - git reset --hard before-rebase &&
> - echo dirty >new_file &&
> - git add new_file &&
> - git pull --rebase --autostash . copy &&
> - test_cmp_rev HEAD^ copy &&
> - test "$(cat new_file)" = dirty &&
> - test "$(cat file)" = "modified again"
> + test_pull_autostash --rebase --autostash
> '
>
> test_expect_success 'pull --rebase --autostash & rebase.autostash=false' '
> test_config rebase.autostash false &&
> - git reset --hard before-rebase &&
> - echo dirty >new_file &&
> - git add new_file &&
> - git pull --rebase --autostash . copy &&
> - test_cmp_rev HEAD^ copy &&
> - test "$(cat new_file)" = dirty &&
> - test "$(cat file)" = "modified again"
> + test_pull_autostash --rebase --autostash
> '
>
> -test_expect_success 'pull --rebase: --autostash & rebase.autostash unset' '
> +test_expect_success 'pull --rebase --autostash & rebase.autostash unset' '
> test_unconfig rebase.autostash &&
> - git reset --hard before-rebase &&
> - echo dirty >new_file &&
> - git add new_file &&
> - git pull --rebase --autostash . copy &&
> - test_cmp_rev HEAD^ copy &&
> - test "$(cat new_file)" = dirty &&
> - test "$(cat file)" = "modified again"
> + test_pull_autostash --rebase --autostash
> '
>
> test_expect_success 'pull --rebase --no-autostash & rebase.autostash=true' '
> --
> 2.7.1.340.g69eb491.dirty
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
