From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 11 Jul 2013 20:05:52 +0000 (-0700)
Subject: Merge branch 'pb/stash-refuse-to-kill'
X-Git-Tag: v1.8.4-rc0~77
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d26792ad69c0d2ea0b197656ae9a562e2c1f900e;p=thirdparty%2Fgit.git

Merge branch 'pb/stash-refuse-to-kill'

"git stash save" is not just about "saving" the local changes, but
also is to restore the working tree state to that of HEAD. If you
changed a non-directory into a directory in the local change, you
may have untracked files in that directory, which have to be killed
while doing so, unless you run it with --include-untracked.  Teach
the command to detect and error out before spreading the damage.

This needed a small fix to "ls-files --killed".

* pb/stash-refuse-to-kill:
  git stash: avoid data loss when "git stash save" kills a directory
  treat_directory(): do not declare submodules to be untracked
---

d26792ad69c0d2ea0b197656ae9a562e2c1f900e