diff options
| author | Junio C Hamano <gitster@pobox.com> | 2026-07-22 10:30:54 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2026-07-22 10:30:54 -0700 |
| commit | 2b8f09faecace1f15ddea3bf249fefd81ac5e92b (patch) | |
| tree | df9eeaac82db1af7f43ef6f0da1e6af61622002c | |
| parent | 518368999ab46b000287a37e1a0c63585fe8e32c (diff) | |
| parent | 9719c290ee5926487caacc1ff059c043323ed183 (diff) | |
Merge branch 'sk/t1100-modernize'
The test script 't/t1100-commit-tree-options.sh' has been modernized
by converting test cases to the modern style (using single quotes and
tab indentation) and moving the creation of the expected file inside
the setup test so it runs under the protection of the test harness.
* sk/t1100-modernize:
t1100: move creation of expected output into setup test
t1100: modernize test style
| -rwxr-xr-x | t/t1100-commit-tree-options.sh | 52 |
1 files changed, 25 insertions, 27 deletions
diff --git a/t/t1100-commit-tree-options.sh b/t/t1100-commit-tree-options.sh index ae66ba5bab..3e888909f5 100755 --- a/t/t1100-commit-tree-options.sh +++ b/t/t1100-commit-tree-options.sh @@ -14,37 +14,35 @@ Also make sure that command line parser understands the normal . ./test-lib.sh -cat >expected <<EOF -tree $EMPTY_TREE -author Author Name <author@email> 1117148400 +0000 -committer Committer Name <committer@email> 1117150200 +0000 +test_expect_success 'test preparation: write empty tree' ' + cat >expected <<-EOF && + tree $EMPTY_TREE + author Author Name <author@email> 1117148400 +0000 + committer Committer Name <committer@email> 1117150200 +0000 -comment text -EOF - -test_expect_success \ - 'test preparation: write empty tree' \ - 'git write-tree >treeid' - -test_expect_success \ - 'construct commit' \ - 'echo comment text | - GIT_AUTHOR_NAME="Author Name" \ - GIT_AUTHOR_EMAIL="author@email" \ - GIT_AUTHOR_DATE="2005-05-26 23:00" \ - GIT_COMMITTER_NAME="Committer Name" \ - GIT_COMMITTER_EMAIL="committer@email" \ - GIT_COMMITTER_DATE="2005-05-26 23:30" \ - TZ=GMT git commit-tree $(cat treeid) >commitid 2>/dev/null' + comment text + EOF + git write-tree >treeid +' -test_expect_success \ - 'read commit' \ - 'git cat-file commit $(cat commitid) >commit' +test_expect_success 'construct commit' ' + echo comment text | + GIT_AUTHOR_NAME="Author Name" \ + GIT_AUTHOR_EMAIL="author@email" \ + GIT_AUTHOR_DATE="2005-05-26 23:00" \ + GIT_COMMITTER_NAME="Committer Name" \ + GIT_COMMITTER_EMAIL="committer@email" \ + GIT_COMMITTER_DATE="2005-05-26 23:30" \ + TZ=GMT git commit-tree $(cat treeid) >commitid 2>/dev/null +' -test_expect_success \ - 'compare commit' \ - 'test_cmp expected commit' +test_expect_success 'read commit' ' + git cat-file commit $(cat commitid) >commit +' +test_expect_success 'compare commit' ' + test_cmp expected commit +' test_expect_success 'flags and then non flags' ' test_tick && |