diff options
author | Brandon Casey <drafnel@gmail.com> | 2011-08-26 19:59:27 -0500 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-08-27 11:12:18 -0700 |
commit | 7474b8b452f2600bd2a9e03f67b83b489aeadb37 (patch) | |
tree | fc97c152850004f775335e3bd4a82f1110fd350f /t/t4252/am-test-5-1 | |
parent | t/t3905: add missing '&&' linkage (diff) | |
download | tgif-7474b8b452f2600bd2a9e03f67b83b489aeadb37.tar.xz |
git-stash: remove untracked/ignored directories when stashed
The two new stash options --include-untracked and --all do not remove the
untracked and/or ignored files that are stashed if those files reside in
a subdirectory. e.g. the following sequence fails:
mkdir untracked &&
echo hello >untracked/file.txt &&
git stash --include-untracked &&
test ! -f untracked/file.txt
Within the git-stash script, git-clean is used to remove the
untracked/ignored files, but since the -d option was not supplied, it does
not remove directories.
So, add -d to the git-clean arguments, and update the tests to test this
functionality.
Reported-by: Hilco Wijbenga <hilco.wijbenga@gmail.com>
Signed-off-by: Brandon Casey <drafnel@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4252/am-test-5-1')
0 files changed, 0 insertions, 0 deletions