mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'bc/unstash-clean-crufts'

Browse Source 
* 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
This commit is contained in:
Junio C Hamano
2011-10-05 12:36:17 -07:00
parent 7af4d3468f 7474b8b452
commit 9eb765d5f4
2 changed files with 36 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
git-stash.sh
View File

@ -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