From 678f3bb60dabece745b95f3a268813a7b17d6955 Mon Sep 17 00:00:00 2001 From: Shlok Kulshreshtha Date: Tue, 14 Jul 2026 17:50:32 +0530 Subject: [PATCH 1/2] t1100: modernize test style The tests in this script use the old style in which the test title and body are passed as separate backslash-continued arguments, with bodies indented using spaces: test_expect_success \ 'title' \ 'body' Convert them to the modern style in which the body is a single-quoted block on its own lines, indented with a tab: test_expect_success 'title' ' body ' While at it, remove an extraneous blank line between two tests. This is a style-only change; no test logic is modified. Signed-off-by: Shlok Kulshreshtha Signed-off-by: Junio C Hamano --- t/t1100-commit-tree-options.sh | 39 +++++++++++++++++----------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/t/t1100-commit-tree-options.sh b/t/t1100-commit-tree-options.sh index ae66ba5bab..9a639f946c 100755 --- a/t/t1100-commit-tree-options.sh +++ b/t/t1100-commit-tree-options.sh @@ -22,29 +22,28 @@ committer Committer Name 1117150200 +0000 comment text EOF -test_expect_success \ - 'test preparation: write empty tree' \ - 'git write-tree >treeid' +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' +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 \ - 'read commit' \ - 'git cat-file commit $(cat commitid) >commit' - -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 && From 9719c290ee5926487caacc1ff059c043323ed183 Mon Sep 17 00:00:00 2001 From: Shlok Kulshreshtha Date: Tue, 14 Jul 2026 17:50:33 +0530 Subject: [PATCH 2/2] t1100: move creation of expected output into setup test The "expected" file is created at the top-level of the script, outside of any test. Code that runs outside of a test is not protected by the test harness: a failure there is not reported as a test failure and is easy to miss. Move the here-doc that creates "expected" into the existing setup test ("test preparation: write empty tree"), using a "<<-" here-doc so its body can be indented along with the rest of the test. Signed-off-by: Shlok Kulshreshtha Signed-off-by: Junio C Hamano --- t/t1100-commit-tree-options.sh | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/t/t1100-commit-tree-options.sh b/t/t1100-commit-tree-options.sh index 9a639f946c..3e888909f5 100755 --- a/t/t1100-commit-tree-options.sh +++ b/t/t1100-commit-tree-options.sh @@ -14,15 +14,14 @@ Also make sure that command line parser understands the normal . ./test-lib.sh -cat >expected < 1117148400 +0000 -committer Committer Name 1117150200 +0000 - -comment text -EOF - test_expect_success 'test preparation: write empty tree' ' + cat >expected <<-EOF && + tree $EMPTY_TREE + author Author Name 1117148400 +0000 + committer Committer Name 1117150200 +0000 + + comment text + EOF git write-tree >treeid '