X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=t%2Ft3903-stash.sh;h=580bfbdc23f4924cea78358629e09a974ad6aa6c;hb=e5ce62b1acc39303d6c3d9a465b116cc234a2fe8;hp=820b350aeb6a6a9162e1ba03543a1260e6d34b3c;hpb=026428c35eb7e4018de3707a08a7dc3d23a69712;p=thirdparty%2Fgit.git

diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh
index 820b350aeb..580bfbdc23 100755
--- a/t/t3903-stash.sh
+++ b/t/t3903-stash.sh
@@ -1253,4 +1253,20 @@ test_expect_success 'stash --keep-index with file deleted in index does not resu
 	test_path_is_missing to-remove
 '
 
+test_expect_success 'stash apply should succeed with unmodified file' '
+	echo base >file &&
+	git add file &&
+	git commit -m base &&
+
+	# now stash a modification
+	echo modified >file &&
+	git stash &&
+
+	# make the file stat dirty
+	cp file other &&
+	mv other file &&
+
+	git stash apply
+'
+
 test_done