From: Barret Rhoden <brho@google.com>
To: git@vger.kernel.org
Cc: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"David Kastrup" <dak@gnu.org>, "Jeff King" <peff@peff.net>,
"Jeff Smith" <whydoubt@gmail.com>,
"Johannes Schindelin" <Johannes.Schindelin@gmx.de>,
"Junio C Hamano" <gitster@pobox.com>,
"René Scharfe" <l.s.r@web.de>,
"Stefan Beller" <stefanbeller@gmail.com>,
"Michael Platings" <michael@platin.gs>
Subject: [PATCH v10 9/9] blame: add a test to cover blame_coalesce()
Date: Mon, 1 Jul 2019 10:45:48 -0400 [thread overview]
Message-ID: <20190701144548.129635-10-brho@google.com> (raw)
In-Reply-To: <20190701144548.129635-1-brho@google.com>
Signed-off-by: Barret Rhoden <brho@google.com>
---
t/t8003-blame-corner-cases.sh | 36 +++++++++++++++++++++++++++++++++++
1 file changed, 36 insertions(+)
diff --git a/t/t8003-blame-corner-cases.sh b/t/t8003-blame-corner-cases.sh
index c92a47b6d5b1..1c5fb1d1f8c9 100755
--- a/t/t8003-blame-corner-cases.sh
+++ b/t/t8003-blame-corner-cases.sh
@@ -275,4 +275,40 @@ test_expect_success 'blame file with CRLF core.autocrlf=true' '
grep "A U Thor" actual
'
+# Tests the splitting and merging of blame entries in blame_coalesce().
+# The output of blame is the same, regardless of whether blame_coalesce() runs
+# or not, so we'd likely only notice a problem if blame crashes or assigned
+# blame to the "splitting" commit ('SPLIT' below).
+test_expect_success 'blame coalesce' '
+ cat >giraffe <<-\EOF &&
+ ABC
+ DEF
+ EOF
+ git add giraffe &&
+ git commit -m "original file" &&
+ oid=$(git rev-parse HEAD) &&
+
+ cat >giraffe <<-\EOF &&
+ ABC
+ SPLIT
+ DEF
+ EOF
+ git add giraffe &&
+ git commit -m "interior SPLIT line" &&
+
+ cat >giraffe <<-\EOF &&
+ ABC
+ DEF
+ EOF
+ git add giraffe &&
+ git commit -m "same contents as original" &&
+
+ cat >expect <<-EOF &&
+ $oid 1) ABC
+ $oid 2) DEF
+ EOF
+ git -c core.abbrev=40 blame -s giraffe >actual &&
+ test_cmp expect actual
+'
+
test_done
--
2.22.0.410.gd8fdbe21b5-goog
prev parent reply other threads:[~2019-07-01 14:46 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-01 14:45 [PATCH v10 0/9] blame: add the ability to ignore commits Barret Rhoden
2019-07-01 14:45 ` [PATCH v10 1/9] fsck: rename and touch up init_skiplist() Barret Rhoden
2019-07-01 14:45 ` [PATCH v10 2/9] Move oidset_parse_file() to oidset.c Barret Rhoden
2019-07-01 14:45 ` [PATCH v10 3/9] blame: use a helper function in blame_chunk() Barret Rhoden
2019-07-01 14:45 ` [PATCH v10 4/9] blame: add the ability to ignore commits and their changes Barret Rhoden
2019-07-01 14:45 ` [PATCH v10 5/9] blame: add config options for the output of ignored or unblamable lines Barret Rhoden
2019-07-01 14:45 ` [PATCH v10 6/9] blame: optionally track line fingerprints during fill_blame_origin() Barret Rhoden
2019-07-01 14:45 ` [PATCH v10 7/9] blame: add a fingerprint heuristic to match ignored lines Barret Rhoden
2019-07-01 14:45 ` [PATCH v10 8/9] blame: use the " Barret Rhoden
2019-07-01 14:45 ` Barret Rhoden [this message]
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190701144548.129635-10-brho@google.com \
--to=brho@google.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=avarab@gmail.com \
--cc=dak@gnu.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=l.s.r@web.de \
--cc=michael@platin.gs \
--cc=peff@peff.net \
--cc=stefanbeller@gmail.com \
--cc=whydoubt@gmail.com \
/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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.