tests for "git add ignored-dir/file" without -f

[git.git] / t / t7103-reset-bare.sh

diff --git a/t/t7103-reset-bare.sh b/t/t7103-reset-bare.sh
index 42bf518c68e6ef07c8be1af714723b2f900a573c..68041df5f49e046c2b7ccd1f3a1c71071498da39 100755 (executable)
--- a/t/t7103-reset-bare.sh
+++ b/t/t7103-reset-bare.sh
@@ -11,16 +11,42 @@ test_expect_success 'setup non-bare' '
        git commit -a -m two
 '
 
+test_expect_success 'hard reset requires a worktree' '
+       (cd .git &&
+        test_must_fail git reset --hard)
+'
+
+test_expect_success 'merge reset requires a worktree' '
+       (cd .git &&
+        test_must_fail git reset --merge)
+'
+
+test_expect_success 'mixed reset is ok' '
+       (cd .git && git reset)
+'
+
+test_expect_success 'soft reset is ok' '
+       (cd .git && git reset --soft)
+'
+
 test_expect_success 'setup bare' '
        git clone --bare . bare.git &&
        cd bare.git
 '
 
-test_expect_success 'hard reset is not allowed' '
-       test_must_fail  git reset --hard HEAD^
+test_expect_success 'hard reset is not allowed in bare' '
+       test_must_fail git reset --hard HEAD^
+'
+
+test_expect_success 'merge reset is not allowed in bare' '
+       test_must_fail git reset --merge HEAD^
+'
+
+test_expect_success 'mixed reset is not allowed in bare' '
+       test_must_fail git reset --mixed HEAD^
 '
 
-test_expect_success 'soft reset is allowed' '
+test_expect_success 'soft reset is allowed in bare' '
        git reset --soft HEAD^ &&
        test "`git show --pretty=format:%s | head -n 1`" = "one"
 '