Allow "git-reset path" when unambiguous

[git.git] / t / t7102-reset.sh

diff --git a/t/t7102-reset.sh b/t/t7102-reset.sh
index 39ba14148c953d17589450917975372802eecfed..96d15083fb5ac540a0825b8c00dc43c8843a6dec 100755 (executable)
--- a/t/t7102-reset.sh
+++ b/t/t7102-reset.sh
@@ -428,4 +428,51 @@ test_expect_success '--mixed refreshes the index' '
        test_cmp expect output
 '
 
+test_expect_success 'disambiguation (1)' '
+
+       git reset --hard &&
+       >secondfile &&
+       git add secondfile &&
+       test_must_fail git reset secondfile &&
+       test -z "$(git diff --cached --name-only)" &&
+       test -f secondfile &&
+       test ! -s secondfile
+
+'
+
+test_expect_success 'disambiguation (2)' '
+
+       git reset --hard &&
+       >secondfile &&
+       git add secondfile &&
+       rm -f secondfile &&
+       test_must_fail git reset secondfile &&
+       test -n "$(git diff --cached --name-only -- secondfile)" &&
+       test ! -f secondfile
+
+'
+
+test_expect_success 'disambiguation (3)' '
+
+       git reset --hard &&
+       >secondfile &&
+       git add secondfile &&
+       rm -f secondfile &&
+       test_must_fail git reset HEAD secondfile &&
+       test -z "$(git diff --cached --name-only)" &&
+       test ! -f secondfile
+
+'
+
+test_expect_success 'disambiguation (4)' '
+
+       git reset --hard &&
+       >secondfile &&
+       git add secondfile &&
+       rm -f secondfile &&
+       test_must_fail git reset -- secondfile &&
+       test -z "$(git diff --cached --name-only)" &&
+       test ! -f secondfile
+'
+
 test_done