`git stash apply`从我的工作副本中删除了一个随机目录

Question

I just tried git stash save for the first time. It worked fine. Then I tried git stash apply and while my uncommitted changes were restored, another effect was that a random dir from the root of my working copy was deleted. I don't know why it chose that exact dir, there's lots of other dirs like it in the root.

git stash save output:

Saved working directory and index state WIP on clipping: cfeac4b - applying the solution from http://stackoverflow.com/questions/40385482/why-cant-i-use-opengl-es-3-0-in-qt
HEAD is now at cfeac4b - applying the solution from http://stackoverflow.com/questions/40385482/why-cant-i-use-opengl-es-3-0-in-qt

Shortened git stash apply output:

Removing debug_stencil_not_working/textureandlight.js
Removing debug_stencil_not_working/qtlogo.png
[... more removes here ...]
On branch clipping
Changes to be committed:
  (use "git reset HEAD <file>..." to unstage)

        new file:   documentation/textureSize_missing.txt

Changes not staged for commit:
  (use "git add/rm <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)

        deleted:    ../debug_stencil_not_working/qtlogo.png
        deleted:    ../debug_stencil_not_working/textureandlight.js
        [... more deleted files here ...]
        modified:   main.cpp
        modified:   main.qml
        [... more modified files here ...]

Untracked files:
  (use "git add <file>..." to include in what will be committed)

        ../dbg_repeater/dbg_repeater.pro.user
        debug_stencil_not_working/
        [... more files and dirs here ...]

Note: The dir that got deleted was a committed and pushed dir. It had no uncommitted local changes.

Any idea why this random dir got deleted?

Also, how to restore this dir? When I browse to the root in the github web interface, it's there. But I tried git pull origin clipping and it didn't pull that dir back into the my working copy.

Edit: I figured out how to restore it. In the TortoiseGit context menu I selected "Diff", and in the list the deleted files were listed as "missing". I selected them all, right clicked them, and selected "revert". Still don't know why the dir got deleted in the first place.

Answer 1

I had the same problem, and I found out by coincident, that in one of the .gitignore files there was an entry with that directory which was deleted on the form: directory/* or directory/** It is only causes when the directory is followed by the wild card char.

Removing that line in my case resolved the problem (it should not have been there anyway)

I am sorry, but I cannot explain why git does this, maybe someone else can.