Merge branch 'js/cmake-extra-built-ins-fix'

[thirdparty/git.git] / t / t2106-update-index-assume-unchanged.sh

diff --git a/t/t2106-update-index-assume-unchanged.sh b/t/t2106-update-index-assume-unchanged.sh
index 99d858c6b755f9d074173b25253a0ae0184ed23d..2d450daf5c8a441acda6eda604e2e28f749bc2dd 100755 (executable)
--- a/t/t2106-update-index-assume-unchanged.sh
+++ b/t/t2106-update-index-assume-unchanged.sh
@@ -5,20 +5,23 @@ test_description='git update-index --assume-unchanged test.
 
 . ./test-lib.sh
 
-test_expect_success 'setup' \
-       ': >file &&
-        git add file &&
-        git commit -m initial &&
-        git branch other &&
-        echo upstream >file &&
-        git add file &&
-        git commit -m upstream'
+test_expect_success 'setup' '
+       : >file &&
+       git add file &&
+       git commit -m initial &&
+       git branch other &&
+       echo upstream >file &&
+       git add file &&
+       git commit -m upstream
+'
 
-test_expect_success 'do not switch branches with dirty file' \
-       'git reset --hard &&
-        git checkout other &&
-        echo dirt >file &&
-        git update-index --assume-unchanged file &&
-        test_must_fail git checkout master'
+test_expect_success 'do not switch branches with dirty file' '
+       git reset --hard &&
+       git checkout other &&
+       echo dirt >file &&
+       git update-index --assume-unchanged file &&
+       test_must_fail git checkout - 2>err &&
+       test_i18ngrep overwritten err
+'
 
 test_done