summaryrefslogtreecommitdiff
path: root/git-stash.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-10-05 19:36:17 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-10-05 19:36:17 (GMT)
commit9eb765d5f400aa922a46f1727259ce114b78561c (patch)
tree74247dd2328d3151340ae632b9ac5dd7e83e3ed4 /git-stash.sh
parent7af4d3468f79c39a75e59aa9699d43d1bbbfd1af (diff)
parent7474b8b452f2600bd2a9e03f67b83b489aeadb37 (diff)
downloadgit-9eb765d5f400aa922a46f1727259ce114b78561c.zip
git-9eb765d5f400aa922a46f1727259ce114b78561c.tar.gz
git-9eb765d5f400aa922a46f1727259ce114b78561c.tar.bz2
Merge branch 'bc/unstash-clean-crufts'
* bc/unstash-clean-crufts: git-stash: remove untracked/ignored directories when stashed t/t3905: add missing '&&' linkage git-stash.sh: fix typo in error message t/t3905: use the name 'actual' for test output, swap arguments to test_cmp
Diffstat (limited to 'git-stash.sh')
-rwxr-xr-xgit-stash.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/git-stash.sh b/git-stash.sh
index 31dec0a..c766692 100755
--- a/git-stash.sh
+++ b/git-stash.sh
@@ -211,7 +211,7 @@ save_stash () {
if test -n "$patch_mode" && test -n "$untracked"
then
- die "Can't use --patch and ---include-untracked or --all at the same time"
+ die "Can't use --patch and --include-untracked or --all at the same time"
fi
stash_msg="$*"
@@ -240,7 +240,7 @@ save_stash () {
test "$untracked" = "all" && CLEAN_X_OPTION=-x || CLEAN_X_OPTION=
if test -n "$untracked"
then
- git clean --force --quiet $CLEAN_X_OPTION
+ git clean --force --quiet -d $CLEAN_X_OPTION
fi
if test "$keep_index" = "t" && test -n $i_tree