summaryrefslogtreecommitdiff
path: root/t/t5520-pull.sh
diff options
context:
space:
mode:
authorMehul Jain <mehul.jain2029@gmail.com>2016-04-02 17:58:30 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-04-04 18:14:58 (GMT)
commit44a59fff4598f3d2f68b5bc83c75e8483637a33d (patch)
treefe6dca74099886797017d0f4d52eab4e43371cf2 /t/t5520-pull.sh
parent5c82bcddf4f436f137bf0608321c92b8328a270a (diff)
downloadgit-44a59fff4598f3d2f68b5bc83c75e8483637a33d.zip
git-44a59fff4598f3d2f68b5bc83c75e8483637a33d.tar.gz
git-44a59fff4598f3d2f68b5bc83c75e8483637a33d.tar.bz2
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 <sunshine@sunshineco.com> Signed-off-by: Mehul Jain <mehul.jain2029@gmail.com> Reviewed-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t5520-pull.sh')
-rwxr-xr-xt/t5520-pull.sh26
1 files changed, 11 insertions, 15 deletions
diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh
index 0b52a34..7392ee1 100755
--- a/t/t5520-pull.sh
+++ b/t/t5520-pull.sh
@@ -19,6 +19,14 @@ test_pull_autostash () {
test "$(cat file)" = "modified again"
}
+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 &&
+ test_i18ngrep "uncommitted changes." err
+}
+
test_expect_success setup '
echo file >file &&
git add file &&
@@ -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' '