Merge branch 'jk/maint-stash-oob' into maint

* jk/maint-stash-oob:
  stash: fix false positive in the invalid ref test.
  stash: fix accidental apply of non-existent stashes

Conflicts:
	t/t3903-stash.sh

diff --combined git-stash.sh
index 81a59a250e0c69b0ead2819d91389146ac8504d7,4f26deacca64f3ce5e0cd4b00745ab8ecf52b551..0a9403653d7dbbb6927973dcfcc41bfd9a904e05
--- 1/git-stash.sh
--- 2/git-stash.sh
+++ b/git-stash.sh
@@@ -12,14 -12,12 +12,14 @@@ USAGE="list [<options>
  
  SUBDIRECTORY_OK=Yes
  OPTIONS_SPEC=
 +START_DIR=`pwd`
  . git-sh-setup
  require_work_tree
  cd_to_toplevel
  
  TMP="$GIT_DIR/.git-stash.$$"
 -trap 'rm -f "$TMP-*"' 0
 +TMPindex=${GIT_INDEX_FILE-"$GIT_DIR/index"}.stash.$$
 +trap 'rm -f "$TMP-"* "$TMPindex"' 0
  
  ref_stash=refs/stash
  
@@@ -83,12 -81,14 +83,12 @@@ create_stash () 
  
                # state of the working tree
                w_tree=$( (
 -                      rm -f "$TMP-index" &&
 -                      cp -p ${GIT_INDEX_FILE-"$GIT_DIR/index"} "$TMP-index" &&
 -                      GIT_INDEX_FILE="$TMP-index" &&
 +                      git read-tree --index-output="$TMPindex" -m $i_tree &&
 +                      GIT_INDEX_FILE="$TMPindex" &&
                        export GIT_INDEX_FILE &&
 -                      git read-tree -m $i_tree &&
                        git diff --name-only -z HEAD | git update-index -z --add --remove --stdin &&
                        git write-tree &&
 -                      rm -f "$TMP-index"
 +                      rm -f "$TMPindex"
                ) ) ||
                        die "Cannot save the current worktree state"
  
@@@ -136,12 -136,11 +136,12 @@@ save_stash () 
                        keep_index=t
                        ;;
                --no-keep-index)
 -                      keep_index=
 +                      keep_index=n
                        ;;
                -p|--patch)
                        patch_mode=t
 -                      keep_index=t
 +                      # only default to keep if we don't already have an override
 +                      test -z "$keep_index" && keep_index=t
                        ;;
                -q|--quiet)
                        GIT_QUIET=t
@@@ -186,7 -185,7 +186,7 @@@
        then
                git reset --hard ${GIT_QUIET:+-q}
  
 -              if test -n "$keep_index" && test -n $i_tree
 +              if test "$keep_index" = "t" && test -n $i_tree
                then
                        git read-tree --reset -u $i_tree
                fi
@@@ -194,7 -193,7 +194,7 @@@
                git apply -R < "$TMP-patch" ||
                die "Cannot remove worktree changes"
  
 -              if test -z "$keep_index"
 +              if test "$keep_index" != "t"
                then
                        git reset
                fi
@@@ -265,7 -264,7 +265,7 @@@ parse_flags_and_rev(
        b_tree=
        i_tree=
  
-       REV=$(git rev-parse --no-flags --symbolic "$@" 2>/dev/null)
+       REV=$(git rev-parse --no-flags --symbolic "$@") || exit 1
  
        FLAGS=
        for opt
@@@ -311,16 -310,6 +311,6 @@@
        IS_STASH_LIKE=t &&
        test "$ref_stash" = "$(git rev-parse --symbolic-full-name "${REV%@*}")" &&
        IS_STASH_REF=t
- 
-       if test "${REV}" != "${REV%{*\}}"
-       then
-               # maintainers: it would be better if git rev-parse indicated
-               # this condition with a non-zero status code but as of 1.7.2.1 it
-               # it did not. So, we use non-empty stderr output as a proxy for the
-               # condition of interest.
-               test -z "$(git rev-parse "$REV" 2>&1 >/dev/null)" || die "$REV does not exist in the stash log"
-       fi
- 
  }
  
  is_stash_like()
@@@ -345,7 -334,9 +335,7 @@@ apply_stash () 
  
        assert_stash_like "$@"
  
 -      git update-index -q --refresh &&
 -      git diff-files --quiet --ignore-submodules ||
 -              die 'Cannot apply to a dirty working tree, please stage your changes'
 +      git update-index -q --refresh || die 'unable to refresh index'
  
        # current index state
        c_tree=$(git write-tree) ||
@@@ -393,7 -384,7 +383,7 @@@
                then
                        squelch='>/dev/null 2>&1'
                fi
 -              eval "git status $squelch" || :
 +              (cd "$START_DIR" && eval "git status $squelch") || :
        else
                # Merge conflict; keep the exit status from merge-recursive
                status=$?

diff --combined t/t3903-stash.sh
index 0bd667f04b8e7c5a55fd0025bcf93e7f894ef394,3c91f48b204764804fbf6d1cef1133d3fe518b87..5c725406422dcedb6c6d5e5d61cfc80f87d3595c
--- 1/t/t3903-stash.sh
--- 2/t/t3903-stash.sh
+++ b/t/t3903-stash.sh
@@@ -37,26 -37,20 +37,32 @@@ test_expect_success 'parents of stash' 
        test_cmp output expect
  '
  
 -test_expect_success 'apply needs clean working directory' '
 -      echo 4 > other-file &&
+ test_expect_success 'applying bogus stash does nothing' '
+       test_must_fail git stash apply stash@{1} &&
+       echo 1 >expect &&
+       test_cmp expect file
+ '
+ 
 +test_expect_success 'apply does not need clean working directory' '
 +      echo 4 >other-file &&
        git add other-file &&
 -      echo 5 > other-file &&
 -      test_must_fail git stash apply
 +      echo 5 >other-file &&
 +      git stash apply &&
 +      echo 3 >expect &&
 +      test_cmp expect file
 +'
 +
 +test_expect_success 'apply does not clobber working directory changes' '
 +      git reset --hard &&
 +      echo 4 >file &&
 +      test_must_fail git stash apply &&
 +      echo 4 >expect &&
 +      test_cmp expect file
  '
  
  test_expect_success 'apply stashed changes' '
 +      git reset --hard &&
 +      echo 5 >other-file &&
        git add other-file &&
        test_tick &&
        git commit -m other-file &&
@@@ -230,14 -224,6 +236,14 @@@ test_expect_success 'stash -k' 
        test bar,bar4 = $(cat file),$(cat file2)
  '
  
 +test_expect_success 'stash --no-keep-index' '
 +      echo bar33 > file &&
 +      echo bar44 > file2 &&
 +      git add file2 &&
 +      git stash --no-keep-index &&
 +      test bar,bar2 = $(cat file),$(cat file2)
 +'
 +
  test_expect_success 'stash --invalid-option' '
        echo bar5 > file &&
        echo bar6 > file2 &&
@@@ -557,11 -543,11 +563,11 @@@ test_expect_success 'invalid ref of th
        echo bar6 > file2 &&
        git add file2 &&
        git stash &&
-       test_must_fail git drop stash@{1} &&
-       test_must_fail git pop stash@{1} &&
-       test_must_fail git apply stash@{1} &&
-       test_must_fail git show stash@{1} &&
-       test_must_fail git branch tmp stash@{1} &&
+       test_must_fail git stash drop stash@{1} &&
+       test_must_fail git stash pop stash@{1} &&
+       test_must_fail git stash apply stash@{1} &&
+       test_must_fail git stash show stash@{1} &&
+       test_must_fail git stash branch tmp stash@{1} &&
        git stash drop
  '
  
@@@ -576,23 -562,4 +582,23 @@@ test_expect_success 'stash branch shoul
        git rev-parse stash@{0} --
  '
  
 +test_expect_success 'stash apply shows status same as git status (relative to current directory)' '
 +      git stash clear &&
 +      echo 1 >subdir/subfile1 &&
 +      echo 2 >subdir/subfile2 &&
 +      git add subdir/subfile1 &&
 +      git commit -m subdir &&
 +      (
 +              cd subdir &&
 +              echo x >subfile1 &&
 +              echo x >../file &&
 +              git status >../expect &&
 +              git stash &&
 +              sane_unset GIT_MERGE_VERBOSITY &&
 +              git stash apply
 +      ) |
 +      sed -e 1,2d >actual && # drop "Saved..." and "HEAD is now..."
 +      test_cmp expect actual
 +'
 +
  test_done