The second patch is the real thing, but "ls-files --killed" needed to be taught about submodules to avoid breaking "stash save" in a repository with submodules, as the new safety uses it to detect what will need to be killed (i.e. file D/F in the working tree getting removed because we need to check out D as a file, or file D in the working tree getting removed because we need to check out D/F as a file) when reverting to the state in HEAD. Junio C Hamano (1): treat_directory(): do not declare submodules to be untracked Petr Baudis (1): git stash: avoid data loss when "git stash save" kills a directory Documentation/git-stash.txt | 12 ++++++++++-- dir.c | 4 +--- git-stash.sh | 12 ++++++++++++ t/t3010-ls-files-killed-modified.sh | 23 ++++++++++++++++++++--- t/t3903-stash.sh | 18 ++++++++++++++++++ 5 files changed, 61 insertions(+), 8 deletions(-) -- 1.8.3.2-798-g923e168 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html