Make sure that applying the stash to a new branch after a conflicting change doesn't result in an error when you try to commit. Signed-off-by: Abhijit Menon-Sen <ams@xxxxxxxxxx> --- At 2008-07-06 14:54:44 +0200, Johannes.Schindelin@xxxxxx wrote: > > AFAICS the previous version is in 'next' already: > 656b50345239293929ad8c639c5f1941c6b867ad Oh, I see, thanks. I misunderstood the request. Here's a separate patch to just add the test. Sorry for the noise. -- ams t/t3903-stash.sh | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh index 54d99ed..6d89218 100755 --- a/t/t3903-stash.sh +++ b/t/t3903-stash.sh @@ -117,4 +117,28 @@ test_expect_success 'stash pop' ' test 0 = $(git stash list | wc -l) ' +cat > expect << EOF +diff --git a/file b/file +index 7601807..5716ca5 100644 +--- a/file ++++ b/file +@@ -1 +1 @@ +-baz ++bar +EOF + +test_expect_success 'stash apply' ' + echo foo > file && + git commit file -m first + echo bar > file && + git stash && + echo baz > file && + git commit file -m second && + git stash branch stashbranch && + git commit file -m alternate\ second && + git diff master..stashbranch > output && + test_cmp output expect && + test 0 = $(git stash list | wc -l) +' + test_done -- 1.5.6 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
