diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-06-25 23:03:26 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-06-25 23:03:27 -0700 |
| commit | 351d06df519ee405a1926e0c6ee34d6a1dba6b46 (patch) | |
| tree | 10b8b7571b43748a993d2aa5d5eba2d1801c0ff1 /t/t3903-stash.sh | |
| parent | b1f0802e9127b117bae7a4cfdc81495f7a9a09f3 (diff) | |
| parent | 19376104a8251a7e6c56579cdcd2eb0a106d1fd6 (diff) | |
| download | git-351d06df519ee405a1926e0c6ee34d6a1dba6b46.tar.gz | |
Merge branch 'jk/stash-require-clean-index' into maint
A hotfix for the topic already in 'master'.
* jk/stash-require-clean-index:
Revert "stash: require a clean index to apply"
Diffstat (limited to 't/t3903-stash.sh')
| -rwxr-xr-x | t/t3903-stash.sh | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh index 7396ca9911..f5f18b7d21 100755 --- 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 && |