X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft7102-reset.sh;h=e5c9f30c73d4dbfe1fff6022bddfe6a387441a9b;hb=41ac414ea2bef81af94474cbef25a38868b4788e;hp=cea9afb764226d3086450cb7c53c881bb9803eec;hpb=03800743156fe4f331a10c0983b9d633bed3a687;p=git.git

diff --git a/t/t7102-reset.sh b/t/t7102-reset.sh
index cea9afb76..e5c9f30c7 100755
--- a/t/t7102-reset.sh
+++ b/t/t7102-reset.sh
@@ -59,6 +59,15 @@ test_expect_success 'giving a non existing revision should fail' '
 	check_changes 3ec39651e7f44ea531a5de18a9fa791c0fd370fc
 '
 
+test_expect_success 'reset --soft with unmerged index should fail' '
+	touch .git/MERGE_HEAD &&
+	echo "100644 44c5b5884550c17758737edcced463447b91d42b 1	un" |
+		git update-index --index-info &&
+	! git reset --soft HEAD &&
+	rm .git/MERGE_HEAD &&
+	git rm --cached -- un
+'
+
 test_expect_success \
 	'giving paths with options different than --mixed should fail' '
 	! git reset --soft -- first &&
@@ -409,4 +418,14 @@ test_expect_success 'resetting an unmodified path is a no-op' '
 	git diff-index --cached --exit-code HEAD
 '
 
+cat > expect << EOF
+file2: needs update
+EOF
+
+test_expect_success '--mixed refreshes the index' '
+	echo 123 >> file2 &&
+	git reset --mixed HEAD > output &&
+	git diff --exit-code expect output
+'
+
 test_done