diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-06-24 12:21:59 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-06-24 12:21:59 -0700 |
| commit | bfb539bb734ee4bc63bf2a6010f935caa78b2b79 (patch) | |
| tree | 3ef9de069c6b448fdb8ea54a6cc78da84e2f9ead /t | |
| parent | Merge branch 'pa/auto-gc-mac-osx' (diff) | |
| parent | Revert "stash: require a clean index to apply" (diff) | |
| download | tgif-bfb539bb734ee4bc63bf2a6010f935caa78b2b79.tar.xz | |
Merge branch 'jk/stash-require-clean-index'
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')
| -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 && |