diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-01-25 22:19:19 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-01-25 22:19:19 (GMT) |
| commit | 42342b3ee6223201c92493043b78cc79b555abdc (patch) | |
| tree | 28f713c1c60421387c981532d998729e1cf673f1 /t/t2012-checkout-last.sh | |
| parent | 60ecad090dab8b1c0bd436252a47c8148212bcc1 (diff) | |
| parent | 4e168333a8716d902aed10c74ae5e408e683f902 (diff) | |
| download | git-42342b3ee6223201c92493043b78cc79b555abdc.zip git-42342b3ee6223201c92493043b78cc79b555abdc.tar.gz git-42342b3ee6223201c92493043b78cc79b555abdc.tar.bz2 | |
Merge branch 'ab/mailmap'
Clean-up docs, codepaths and tests around mailmap.
* ab/mailmap: (22 commits)
shortlog: remove unused(?) "repo-abbrev" feature
mailmap doc + tests: document and test for case-insensitivity
mailmap tests: add tests for empty "<>" syntax
mailmap tests: add tests for whitespace syntax
mailmap tests: add a test for comment syntax
mailmap doc + tests: add better examples & test them
tests: refactor a few tests to use "test_commit --append"
test-lib functions: add an --append option to test_commit
test-lib functions: add --author support to test_commit
test-lib functions: document arguments to test_commit
test-lib functions: expand "test_commit" comment template
mailmap: test for silent exiting on missing file/blob
mailmap tests: get rid of overly complex blame fuzzing
mailmap tests: add a test for "not a blob" error
mailmap tests: remove redundant entry in test
mailmap tests: improve --stdin tests
mailmap tests: modernize syntax & test idioms
mailmap tests: use our preferred whitespace syntax
mailmap doc: start by mentioning the comment syntax
check-mailmap doc: note config options
...
Diffstat (limited to 't/t2012-checkout-last.sh')
| -rwxr-xr-x | t/t2012-checkout-last.sh | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/t/t2012-checkout-last.sh b/t/t2012-checkout-last.sh index 028a00d..0e7d47a 100755 --- a/t/t2012-checkout-last.sh +++ b/t/t2012-checkout-last.sh @@ -8,13 +8,9 @@ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./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' ' @@ -96,9 +92,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...main' ' |