From: Johannes Sixt Date: Thu, 27 Aug 2009 07:35:55 +0000 (+0200) Subject: Make test case number unique X-Git-Tag: v1.6.5-rc0~5^2~1 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=14c674e9dc52c4b93512b22748c01ca6ccdef7bd;p=git.git Make test case number unique Signed-off-by: Johannes Sixt Signed-off-by: Junio C Hamano --- diff --git a/t/t2015-checkout-patch.sh b/t/t2015-checkout-patch.sh deleted file mode 100755 index 4d1c2e9e0..000000000 --- a/t/t2015-checkout-patch.sh +++ /dev/null @@ -1,107 +0,0 @@ -#!/bin/sh - -test_description='git checkout --patch' - -. ./lib-patch-mode.sh - -test_expect_success 'setup' ' - mkdir dir && - echo parent > dir/foo && - echo dummy > bar && - git add bar dir/foo && - git commit -m initial && - test_tick && - test_commit second dir/foo head && - set_and_save_state bar bar_work bar_index && - save_head -' - -# note: bar sorts before dir/foo, so the first 'n' is always to skip 'bar' - -test_expect_success 'saying "n" does nothing' ' - set_and_save_state dir/foo work head && - (echo n; echo n) | git checkout -p && - verify_saved_state bar && - verify_saved_state dir/foo -' - -test_expect_success 'git checkout -p' ' - (echo n; echo y) | git checkout -p && - verify_saved_state bar && - verify_state dir/foo head head -' - -test_expect_success 'git checkout -p with staged changes' ' - set_state dir/foo work index - (echo n; echo y) | git checkout -p && - verify_saved_state bar && - verify_state dir/foo index index -' - -test_expect_success 'git checkout -p HEAD with NO staged changes: abort' ' - set_and_save_state dir/foo work head && - (echo n; echo y; echo n) | git checkout -p HEAD && - verify_saved_state bar && - verify_saved_state dir/foo -' - -test_expect_success 'git checkout -p HEAD with NO staged changes: apply' ' - (echo n; echo y; echo y) | git checkout -p HEAD && - verify_saved_state bar && - verify_state dir/foo head head -' - -test_expect_success 'git checkout -p HEAD with change already staged' ' - set_state dir/foo index index - # the third n is to get out in case it mistakenly does not apply - (echo n; echo y; echo n) | git checkout -p HEAD && - verify_saved_state bar && - verify_state dir/foo head head -' - -test_expect_success 'git checkout -p HEAD^' ' - # the third n is to get out in case it mistakenly does not apply - (echo n; echo y; echo n) | git checkout -p HEAD^ && - verify_saved_state bar && - verify_state dir/foo parent parent -' - -# The idea in the rest is that bar sorts first, so we always say 'y' -# first and if the path limiter fails it'll apply to bar instead of -# dir/foo. There's always an extra 'n' to reject edits to dir/foo in -# the failure case (and thus get out of the loop). - -test_expect_success 'path limiting works: dir' ' - set_state dir/foo work head && - (echo y; echo n) | git checkout -p dir && - verify_saved_state bar && - verify_state dir/foo head head -' - -test_expect_success 'path limiting works: -- dir' ' - set_state dir/foo work head && - (echo y; echo n) | git checkout -p -- dir && - verify_saved_state bar && - verify_state dir/foo head head -' - -test_expect_success 'path limiting works: HEAD^ -- dir' ' - # the third n is to get out in case it mistakenly does not apply - (echo y; echo n; echo n) | git checkout -p HEAD^ -- dir && - verify_saved_state bar && - verify_state dir/foo parent parent -' - -test_expect_success 'path limiting works: foo inside dir' ' - set_state dir/foo work head && - # the third n is to get out in case it mistakenly does not apply - (echo y; echo n; echo n) | (cd dir && git checkout -p foo) && - verify_saved_state bar && - verify_state dir/foo head head -' - -test_expect_success 'none of this moved HEAD' ' - verify_saved_head -' - -test_done diff --git a/t/t2016-checkout-patch.sh b/t/t2016-checkout-patch.sh new file mode 100755 index 000000000..4d1c2e9e0 --- /dev/null +++ b/t/t2016-checkout-patch.sh @@ -0,0 +1,107 @@ +#!/bin/sh + +test_description='git checkout --patch' + +. ./lib-patch-mode.sh + +test_expect_success 'setup' ' + mkdir dir && + echo parent > dir/foo && + echo dummy > bar && + git add bar dir/foo && + git commit -m initial && + test_tick && + test_commit second dir/foo head && + set_and_save_state bar bar_work bar_index && + save_head +' + +# note: bar sorts before dir/foo, so the first 'n' is always to skip 'bar' + +test_expect_success 'saying "n" does nothing' ' + set_and_save_state dir/foo work head && + (echo n; echo n) | git checkout -p && + verify_saved_state bar && + verify_saved_state dir/foo +' + +test_expect_success 'git checkout -p' ' + (echo n; echo y) | git checkout -p && + verify_saved_state bar && + verify_state dir/foo head head +' + +test_expect_success 'git checkout -p with staged changes' ' + set_state dir/foo work index + (echo n; echo y) | git checkout -p && + verify_saved_state bar && + verify_state dir/foo index index +' + +test_expect_success 'git checkout -p HEAD with NO staged changes: abort' ' + set_and_save_state dir/foo work head && + (echo n; echo y; echo n) | git checkout -p HEAD && + verify_saved_state bar && + verify_saved_state dir/foo +' + +test_expect_success 'git checkout -p HEAD with NO staged changes: apply' ' + (echo n; echo y; echo y) | git checkout -p HEAD && + verify_saved_state bar && + verify_state dir/foo head head +' + +test_expect_success 'git checkout -p HEAD with change already staged' ' + set_state dir/foo index index + # the third n is to get out in case it mistakenly does not apply + (echo n; echo y; echo n) | git checkout -p HEAD && + verify_saved_state bar && + verify_state dir/foo head head +' + +test_expect_success 'git checkout -p HEAD^' ' + # the third n is to get out in case it mistakenly does not apply + (echo n; echo y; echo n) | git checkout -p HEAD^ && + verify_saved_state bar && + verify_state dir/foo parent parent +' + +# The idea in the rest is that bar sorts first, so we always say 'y' +# first and if the path limiter fails it'll apply to bar instead of +# dir/foo. There's always an extra 'n' to reject edits to dir/foo in +# the failure case (and thus get out of the loop). + +test_expect_success 'path limiting works: dir' ' + set_state dir/foo work head && + (echo y; echo n) | git checkout -p dir && + verify_saved_state bar && + verify_state dir/foo head head +' + +test_expect_success 'path limiting works: -- dir' ' + set_state dir/foo work head && + (echo y; echo n) | git checkout -p -- dir && + verify_saved_state bar && + verify_state dir/foo head head +' + +test_expect_success 'path limiting works: HEAD^ -- dir' ' + # the third n is to get out in case it mistakenly does not apply + (echo y; echo n; echo n) | git checkout -p HEAD^ -- dir && + verify_saved_state bar && + verify_state dir/foo parent parent +' + +test_expect_success 'path limiting works: foo inside dir' ' + set_state dir/foo work head && + # the third n is to get out in case it mistakenly does not apply + (echo y; echo n; echo n) | (cd dir && git checkout -p foo) && + verify_saved_state bar && + verify_state dir/foo head head +' + +test_expect_success 'none of this moved HEAD' ' + verify_saved_head +' + +test_done