From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: Barret Rhoden <brho@google.com>, Nuthan Munaiah <nm6061@rit.edu>,
git@vger.kernel.org
Subject: [PATCH 2/3] t8003: factor setup out of coalesce test
Date: Thu, 13 Aug 2020 01:23:41 -0400 [thread overview]
Message-ID: <20200813052341.GB2514880@coredump.intra.peff.net> (raw)
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
next prev parent reply other threads:[~2020-08-13 5:23 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-07 1:05 `git blame` Line Number Off-by-one Nuthan Munaiah
2020-08-07 21:21 ` Jeff King
2020-08-07 21:33 ` Jeff King
2020-08-07 21:45 ` Jeff King
2020-08-07 22:05 ` Junio C Hamano
2020-08-07 22:26 ` Jeff King
2020-08-07 22:35 ` Jeff King
2020-08-13 5:20 ` [PATCH 0/3] blame: fix bug in coalescing non-adjacent "-L" chunks Jeff King
2020-08-13 5:23 ` [PATCH 1/3] t8003: check output of coalesced blame Jeff King
2020-08-13 17:04 ` Junio C Hamano
2020-08-13 17:22 ` Jeff King
2020-08-13 5:23 ` Jeff King [this message]
2020-08-13 5:25 ` [PATCH 3/3] blame: only coalesce lines that are adjacent in result Jeff King
2020-08-13 16:59 ` Junio C Hamano
2020-08-13 18:41 ` Junio C Hamano
2020-08-13 12:25 ` [PATCH 0/3] blame: fix bug in coalescing non-adjacent "-L" chunks Barret Rhoden
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200813052341.GB2514880@coredump.intra.peff.net \
--to=peff@peff.net \
--cc=brho@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=nm6061@rit.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).