From 21ec98a75d9cecaeb1493462da593343441661b6 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Thu, 7 Apr 2011 12:04:19 -0500 Subject: [PATCH] stash: add two more tests for --no-keep-index One of these passes just fine; the other one exposes a problem where command line flag order matters for --no-keep-index and --patch interaction. Signed-off-by: Dan McGee Signed-off-by: Junio C Hamano --- t/t3903-stash.sh | 8 ++++++++ t/t3904-stash-patch.sh | 12 ++++++++++++ 2 files changed, 20 insertions(+) diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh index f62aaf581..bca2df157 100755 --- a/t/t3903-stash.sh +++ b/t/t3903-stash.sh @@ -218,6 +218,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 && diff --git a/t/t3904-stash-patch.sh b/t/t3904-stash-patch.sh index 1e7193ac0..4d5878950 100755 --- a/t/t3904-stash-patch.sh +++ b/t/t3904-stash-patch.sh @@ -48,6 +48,18 @@ test_expect_success PERL 'git stash -p --no-keep-index' ' verify_state bar dummy bar_index ' +test_expect_failure PERL 'git stash --no-keep-index -p' ' + set_state dir/foo work index && + set_state bar bar_work bar_index && + (echo n; echo y) | git stash save --no-keep-index -p && + verify_state dir/foo head head && + verify_state bar bar_work dummy && + git reset --hard && + git stash apply --index && + verify_state dir/foo work index && + verify_state bar dummy bar_index +' + test_expect_success PERL 'none of this moved HEAD' ' verify_saved_head ' -- 2.30.2