diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-08-14 09:53:43 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-08-14 09:53:43 -0700 |
| commit | c1ebd90c832e28ff27654c21f9985aebe986352d (patch) | |
| tree | f0f667fa35abcf6fd80c38ca988827f8f2c93225 /t | |
| parent | Git 1.8.4-rc3 (diff) | |
| download | tgif-c1ebd90c832e28ff27654c21f9985aebe986352d.tar.xz | |
Revert "git stash: avoid data loss when "git stash save" kills a directory"
This reverts commit a73653130edd6a8977106d45a8092c09040f9132, as it
has been reported that "ls-files --killed" is too time-consuming in
a deep directory with too many untracked crufts (e.g. $HOME/.git
tracking only a few files).
We'd need to revisit it later but "ls-files --killed" needs to be
optimized before it happens.
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3903-stash.sh | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh index 5d22f17ca2..debda7a678 100755 --- a/t/t3903-stash.sh +++ b/t/t3903-stash.sh @@ -673,22 +673,4 @@ test_expect_success 'store updates stash ref and reflog' ' grep quux bazzy ' -test_expect_success 'stash a change to turn a non-directory to a directory' ' - git reset --hard && - >testfile && - git add testfile && - git commit -m "add testfile as a regular file" && - rm testfile && - mkdir testfile && - >testfile/file && - test_must_fail git stash save "recover regular file" && - test -f testfile/file -' - -test_expect_success 'stash a change to turn a non-directory to a directory (forced)' ' - git stash save --force "recover regular file (forced)" && - ! test -f testfile/file && - test -f testfile -' - test_done |