Merge branch 'tr/maint-t3903-misquoted-command'

* tr/maint-t3903-misquoted-command:
t3903: fix misquoted rev-parse invocation

diff --combined t/t3903-stash.sh
index 7197aae1ed10add49aa72748188fecb4c2ef90a4,f56979d15a16b0aae60117eddc71cd8d9ca85727..fcdb18217a777f5dbb77b0071af7159c6985656d
--- 1/t/t3903-stash.sh
--- 2/t/t3903-stash.sh
+++ b/t/t3903-stash.sh
@@@ -37,32 -37,14 +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 &&
@@@ -87,10 -69,9 +87,10 @@@ test_expect_success 'apply stashed chan
  test_expect_success 'unstashing in a subdirectory' '
        git reset --hard HEAD &&
        mkdir subdir &&
 -      cd subdir &&
 -      git stash apply &&
 -      cd ..
 +      (
 +              cd subdir &&
 +              git stash apply
 +      )
  '
  
  test_expect_success 'drop top stash' '
@@@ -175,7 -156,7 +175,7 @@@ EO
  
  test_expect_success 'stash branch' '
        echo foo > file &&
 -      git commit file -m first
 +      git commit file -m first &&
        echo bar > file &&
        echo bar2 > file2 &&
        git add file2 &&
@@@ -236,14 -217,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 &&
@@@ -281,7 -254,7 +281,7 @@@ test_expect_success 'stash rm and ignor
        echo file >.gitignore &&
        git stash save "rm and ignore" &&
        test bar = "$(cat file)" &&
 -      test file = "$(cat .gitignore)"
 +      test file = "$(cat .gitignore)" &&
        git stash apply &&
        ! test -r file &&
        test file = "$(cat .gitignore)"
@@@ -294,7 -267,7 +294,7 @@@ test_expect_success 'stash rm and ignor
        git add .gitignore &&
        git stash save "rm and ignore (stage .gitignore)" &&
        test bar = "$(cat file)" &&
 -      ! test -r .gitignore
 +      ! test -r .gitignore &&
        git stash apply &&
        ! test -r file &&
        test file = "$(cat .gitignore)"
@@@ -442,37 -415,8 +442,37 @@@ test_expect_success 'stash show - stash
        echo bar >> file &&
        STASH_ID=$(git stash create) &&
        git reset --hard &&
 -      git stash show ${STASH_ID}
 +      cat >expected <<-EOF &&
 +       file |    1 +
 +       1 files changed, 1 insertions(+), 0 deletions(-)
 +      EOF
 +      git stash show ${STASH_ID} >actual &&
 +      test_cmp expected actual
  '
 +
 +test_expect_success 'stash show -p - stashes on stack, stash-like argument' '
 +      git stash clear &&
 +      test_when_finished "git reset --hard HEAD" &&
 +      git reset --hard &&
 +      echo foo >> file &&
 +      git stash &&
 +      test_when_finished "git stash drop" &&
 +      echo bar >> file &&
 +      STASH_ID=$(git stash create) &&
 +      git reset --hard &&
 +      cat >expected <<-EOF &&
 +      diff --git a/file b/file
 +      index 7601807..935fbd3 100644
 +      --- a/file
 +      +++ b/file
 +      @@ -1 +1,2 @@
 +       baz
 +      +bar
 +      EOF
 +      git stash show -p ${STASH_ID} >actual &&
 +      test_cmp expected actual
 +'
 +
  test_expect_success 'stash show - no stashes on stack, stash-like argument' '
        git stash clear &&
        test_when_finished "git reset --hard HEAD" &&
@@@ -480,32 -424,7 +480,32 @@@
        echo foo >> file &&
        STASH_ID=$(git stash create) &&
        git reset --hard &&
 -      git stash show ${STASH_ID}
 +      cat >expected <<-EOF &&
 +       file |    1 +
 +       1 files changed, 1 insertions(+), 0 deletions(-)
 +      EOF
 +      git stash show ${STASH_ID} >actual &&
 +      test_cmp expected actual
 +'
 +
 +test_expect_success 'stash show -p - no stashes on stack, stash-like argument' '
 +      git stash clear &&
 +      test_when_finished "git reset --hard HEAD" &&
 +      git reset --hard &&
 +      echo foo >> file &&
 +      STASH_ID=$(git stash create) &&
 +      git reset --hard &&
 +      cat >expected <<-EOF &&
 +      diff --git a/file b/file
 +      index 7601807..71b52c4 100644
 +      --- a/file
 +      +++ b/file
 +      @@ -1 +1,2 @@
 +       baz
 +      +foo
 +      EOF
 +      git stash show -p ${STASH_ID} >actual &&
 +      test_cmp expected actual
  '
  
  test_expect_success 'stash drop - fail early if specified stash is not a stash reference' '
@@@ -536,13 -455,13 +536,13 @@@ test_expect_success 'stash pop - fail e
        git reset --hard HEAD
  '
  
 -test_expect_success 'ref with non-existant reflog' '
 +test_expect_success 'ref with non-existent reflog' '
        git stash clear &&
        echo bar5 > file &&
        echo bar6 > file2 &&
        git add file2 &&
        git stash &&
-       ! "git rev-parse --quiet --verify does-not-exist" &&
+       test_must_fail git rev-parse --quiet --verify does-not-exist &&
        test_must_fail git stash drop does-not-exist &&
        test_must_fail git stash drop does-not-exist@{0} &&
        test_must_fail git stash pop does-not-exist &&
@@@ -563,42 -482,12 +563,42 @@@ 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
  '
  
 +test_expect_success 'stash branch should not drop the stash if the branch exists' '
 +      git stash clear &&
 +      echo foo >file &&
 +      git add file &&
 +      git commit -m initial &&
 +      echo bar >file &&
 +      git stash &&
 +      test_must_fail git stash branch master stash@{0} &&
 +      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