Merge branch 'cb/diff-fname-optim' into maint

diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh
index 4215cc698613879e22adcc5e68d3f8ee6281940e..903a122efe0c54cb44eb6c3e7ed04bdbab81439d 100755 (executable)
--- a/t/t3903-stash.sh
+++ b/t/t3903-stash.sh
@@ -545,7 +545,7 @@ test_expect_success 'invalid ref of the form stash@{n}, n >= N' '
        git stash drop
 '
 
-test_expect_failure 'stash branch should not drop the stash if the branch exists' '
+test_expect_success 'stash branch should not drop the stash if the branch exists' '
        git stash clear &&
        echo foo >file &&
        git add file &&