From 6eaf92f3d08180da4a6bd40035919a7e07ffed5a Mon Sep 17 00:00:00 2001 From: Piotr Krukowiecki Date: Mon, 14 Mar 2011 20:19:36 +0100 Subject: [PATCH] Add test: git stash shows status relative to current dir [jc: moved "cd subdir" inside subshell and fixed comparison with expected] Signed-off-by: Piotr Krukowiecki Signed-off-by: Junio C Hamano --- t/t3903-stash.sh | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh index 6fd560ccf1..f62aaf5816 100755 --- a/t/t3903-stash.sh +++ b/t/t3903-stash.sh @@ -556,4 +556,23 @@ test_expect_success 'stash branch should not drop the stash if the branch exists 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