[PATCH 2/3] t8003: factor setup out of coalesce test
- From
Jeff King <peff@peff.net>
- Date
- Aug 13, 2020, 05:23 UTC
- Message-ID
- <20200813052341.GB2514880@coredump.intra.peff.net>
- In-Reply-To
- <20200813052054.GA1962792@coredump.intra.peff.net>
In preparation for adding more tests of blame's coalesce code, let's split the setup out from the first test, and give each of the commits a more meaningful name:
- $orig for the original source that added the lines
- $split for the version where they are split apart
- $final for the final version that re-joins them
That's not strictly necessary, but makes the follow-on tests less brittle than relying on HEAD^, etc, to name the commits.
Signed-off-by: Jeff King <peff@peff.net> --- t/t8003-blame-corner-cases.sh | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/t/t8003-blame-corner-cases.sh b/t/t8003-blame-corner-cases.sh index 1e89494ef6..7f39a84289 100755 --- a/t/t8003-blame-corner-cases.sh +++ b/t/t8003-blame-corner-cases.sh @@ -273,14 +273,14 @@ test_expect_success 'blame file with CRLF core.autocrlf=true' ' grep "A U Thor" actual ' -test_expect_success 'blame coalesce' ' +test_expect_success 'setup coalesce tests' ' cat >giraffe <<-\EOF && ABC DEF EOF git add giraffe && git commit -m "original file" && - oid=$(git rev-parse HEAD) && + orig=$(git rev-parse HEAD) && cat >giraffe <<-\EOF && ABC @@ -289,20 +289,24 @@ test_expect_success 'blame coalesce' ' EOF git add giraffe && git commit -m "interior SPLIT line" && + split=$(git rev-parse HEAD) && cat >giraffe <<-\EOF && ABC DEF EOF git add giraffe && git commit -m "same contents as original" && + final=$(git rev-parse HEAD) +' +test_expect_success 'blame coalesce' ' cat >expect <<-EOF && - $oid 1 1 2 - $oid 2 2 + $orig 1 1 2 + $orig 2 2 EOF - git blame --porcelain giraffe >actual.raw && - grep "^$oid" actual.raw >actual && + git blame --porcelain $final giraffe >actual.raw && + grep "^$orig" actual.raw >actual && test_cmp expect actual '
-- 2.28.0.570.ge2c3ee08e4