summaryrefslogtreecommitdiff
path: root/t/t2012-checkout-last.sh
diff options
context:
space:
mode:
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>2021-01-12 20:18:00 (GMT)
committerJunio C Hamano <gitster@pobox.com>2021-01-12 22:04:41 (GMT)
commitf5d79bf7dd6996b96009ac63b350aa047f2d9959 (patch)
tree90f3d3f39a2e48de0390a6fc8aea45b11c57d13e /t/t2012-checkout-last.sh
parent3373518cc8bd0916581ccfd4a2ee9682d61a8874 (diff)
downloadgit-f5d79bf7dd6996b96009ac63b350aa047f2d9959.zip
git-f5d79bf7dd6996b96009ac63b350aa047f2d9959.tar.gz
git-f5d79bf7dd6996b96009ac63b350aa047f2d9959.tar.bz2
tests: refactor a few tests to use "test_commit --append"
Refactor a few more tests to use the new "--append" option to "test_commit". I added it for use in the mailmap tests, but this demonstrates how useful it is in general. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t2012-checkout-last.sh')
-rwxr-xr-xt/t2012-checkout-last.sh12
1 files changed, 3 insertions, 9 deletions
diff --git a/t/t2012-checkout-last.sh b/t/t2012-checkout-last.sh
index e7ba8c5..c95aa3e 100755
--- a/t/t2012-checkout-last.sh
+++ b/t/t2012-checkout-last.sh
@@ -5,13 +5,9 @@ test_description='checkout can switch to last branch and merge base'
. ./test-lib.sh
test_expect_success 'setup' '
- echo hello >world &&
- git add world &&
- git commit -m initial &&
+ test_commit initial world hello &&
git branch other &&
- echo "hello again" >>world &&
- git add world &&
- git commit -m second
+ test_commit --append second world "hello again"
'
test_expect_success '"checkout -" does not work initially' '
@@ -93,9 +89,7 @@ test_expect_success 'switch to twelfth from the last' '
test_expect_success 'merge base test setup' '
git checkout -b another other &&
- echo "hello again" >>world &&
- git add world &&
- git commit -m third
+ test_commit --append third world "hello again"
'
test_expect_success 'another...master' '