From: Philip Oakley <philipoakley@iee.email>
To: git@vger.kernel.org
Subject: [PATCH 4/4] blame: test the -b option, use blank oid for boundary commits.
Date: Mon, 25 May 2020 22:57:51 +0100 [thread overview]
Message-ID: <20200525215751.1735-5-philipoakley@iee.email> (raw)
In-Reply-To: <20200525215751.1735-1-philipoakley@iee.email>
4c10a5caa7 (blame: -b (blame.blankboundary) and --root (blame.showroot),
2006-12-18) introduced the -b option. Add a test.
The sed script removes the last hex digit from boundary commit oids
'^hexx msg' -> '^hex msg' until all leading hex's are gone, finally
removing the boundary commit marker.
Signed-off-by: Philip Oakley <philipoakley@iee.email>
---
t/t8002-blame.sh | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/t/t8002-blame.sh b/t/t8002-blame.sh
index d4877c7c54..de0f81abe9 100755
--- a/t/t8002-blame.sh
+++ b/t/t8002-blame.sh
@@ -129,4 +129,16 @@ test_expect_success 'test --blame-only, exclude boundary commits' '
test_cmp expected actual
'
+test_expect_success 'test -b option, blank oid for boundary commits' '
+ git blame -b branch1.. -- file >actual &&
+ git blame branch1.. -- file >full &&
+ sed -e "/^\^/{
+ :loop;
+ s/^\(\^[0-9a-f]*\)[0-9a-f] \(.*\)/\1 \2/g;
+ tloop;
+ s/^\^/ /;
+ }" full >expected &&
+ test_cmp expected actual
+'
+
test_done
--
2.26.2.windows.1.13.g9dddff6983
next prev parent reply other threads:[~2020-05-25 21:58 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-25 21:57 [PATCH 0/4] Selectively show only blamed limes Philip Oakley
2020-05-25 21:57 ` [PATCH 1/4] doc: blame: show the boundary commit '^' caret mark Philip Oakley
2020-05-25 21:57 ` [PATCH 2/4] blame: add option to show only blamed commits `--blame-only` Philip Oakley
2020-05-25 21:57 ` [PATCH 3/4] blame: do not show boundary commits, only those blamed Philip Oakley
2020-05-25 21:57 ` Philip Oakley [this message]
2020-05-27 7:30 ` [PATCH 4/4] blame: test the -b option, use blank oid for boundary commits Jeff King
2020-05-27 10:52 ` Philip Oakley
2020-05-27 7:23 ` [PATCH 0/4] Selectively show only blamed limes Jeff King
2020-05-27 10:24 ` Philip Oakley
2020-05-28 16:45 ` Jeff King
2020-05-28 18:30 ` Junio C Hamano
2020-05-30 16:18 ` Philip Oakley
2020-05-31 16:02 ` Junio C Hamano
2020-05-31 16:28 ` Junio C Hamano
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=20200525215751.1735-5-philipoakley@iee.email \
--to=philipoakley@iee.email \
--cc=git@vger.kernel.org \
/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.