Merge branch 'jc/rerere'

diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh
index 0746eeeff70c29c91accacdfa1efa4bc2e612715..2142c1fa92017bc47cfc4ccb1f25e16fc0eec1a4 100755 (executable)
--- a/t/t3903-stash.sh
+++ b/t/t3903-stash.sh
@@ -45,13 +45,6 @@ test_expect_success 'applying bogus stash does nothing' '
        test_cmp expect file
 '
 
-test_expect_success 'apply requires a clean index' '
-       test_when_finished "git reset --hard" &&
-       echo changed >other-file &&
-       git add other-file &&
-       test_must_fail git stash apply
-'
-
 test_expect_success 'apply does not need clean working directory' '
        echo 4 >other-file &&
        git stash apply &&
@@ -100,6 +93,10 @@ test_expect_success 'unstashing in a subdirectory' '
        )
 '
 
+test_expect_success 'stash drop complains of extra options' '
+       test_must_fail git stash drop --foo
+'
+
 test_expect_success 'drop top stash' '
        git reset --hard &&
        git stash list > stashlist1 &&
@@ -675,7 +672,7 @@ test_expect_success 'store updates stash ref and reflog' '
        ! grep quux bazzy &&
        git stash store -m quuxery $STASH_ID &&
        test $(cat .git/refs/stash) = $STASH_ID &&
-       grep $STASH_ID .git/logs/refs/stash &&
+       git reflog --format=%H stash| grep $STASH_ID &&
        git stash pop &&
        grep quux bazzy
 '