Signed-off-by: Mehul Jain <mehul.jain2...@gmail.com>
---
t/t5520-pull.sh | 19 +++++++++++++++++++
t/t5521-pull-options.sh | 16 ++++++++++++++++
2 files changed, 35 insertions(+)
diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh
index c952d5e..f5d1d31 100755
--- a/t/t5520-pull.sh
+++ b/t/t5520-pull.sh
@@ -245,6 +245,25 @@ test_expect_success '--rebase fails with multiple
branches' '
test modified = "$(git show HEAD:file)"
'
+test_expect_success 'pull --rebase --no-autostash fails with dirty working
directory and rebase.autstash set 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
+'
+
+test_expect_success 'pull --rebase --autostash succeeds with dirty working
directory and rebase.autstash set 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_expect_success 'pull --rebase succeeds with dirty working directory and
rebase.autostash set' '
test_config rebase.autostash true &&
git reset --hard before-rebase &&
diff --git a/t/t5521-pull-options.sh b/t/t5521-pull-options.sh
index 18372ca..3930e45 100755
--- a/t/t5521-pull-options.sh
+++ b/t/t5521-pull-options.sh
@@ -62,6 +62,22 @@ test_expect_success 'git pull -v --rebase' '
test_must_be_empty out)
'
+test_expect_success 'git pull --rebase --autostash' '
+ mkdir clonedrbas &&
+ (cd clonedrbas && git init &&
+ git pull --rebase --autostash "../parent" >out 2>err &&
+ test -s err &&
+ test_must_be_empty out)
+'
+
+test_expect_success 'git pull --rebase --no-autostash' '
+ mkdir clonedrbnas &&
+ (cd clonedrbnas && git init &&
+ git pull --rebase --no-autostash "../parent" >out 2>err &&
+ test -s err &&
+ test_must_be_empty out)
+'
+
test_expect_success 'git pull -v -q' '
mkdir clonedvq &&
(cd clonedvq && git init &&
--
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
