From: Keita Oda <ainsophyao@gmail•com>
To: git@vger•kernel.org
Cc: Keita ODA <ainsophyao@gmail•com>
Subject: [RFC PATCH 3/3] t4034: cover moved-and-edited word diff alignment
Date: Wed, 27 May 2026 13:24:02 +0900 [thread overview]
Message-ID: <20260527042402.13607-4-ainsophyao@gmail.com> (raw)
In-Reply-To: <20260527042402.13607-1-ainsophyao@gmail.com>
From: Keita ODA <ainsophyao@gmail•com>
Add a focused --word-diff-align test with a moved permission-style block where
one value changes inside the moved block.
The test is intentionally small. It checks that the changed line is paired and
that the RFC renderer exposes the old and new value with word-diff-like
markers.
---
t/t4034-diff-words.sh | 46 +++++++++++++++++++++++++++++++++++++++++++
1 file changed, 46 insertions(+)
diff --git a/t/t4034-diff-words.sh b/t/t4034-diff-words.sh
index 0be647c2f..7bf696b17 100755
--- a/t/t4034-diff-words.sh
+++ b/t/t4034-diff-words.sh
@@ -148,6 +148,52 @@ test_expect_success '--word-diff=plain' '
word_diff --word-diff=plain --no-color
'
+test_expect_success '--word-diff-align marks moved-and-edited block lines' '
+ cat >old <<-\EOF &&
+ #define LIMIT_PUBLIC_UPLOADS 25
+ #define LIMIT_PUBLIC_INVITES 8
+
+ /* Public resource permissions. */
+ #define PERM_RESOURCE_READ 0x0001
+ #define PERM_RESOURCE_LIST 0x0002
+ #define PERM_RESOURCE_COMMENT 0x0004
+ #define PERM_RESOURCE_EXPORT 0x0008
+ #define PERM_RESOURCE_SHARE 0x0010
+ #define PERM_RESOURCE_ARCHIVE 0x0020
+ #define PERM_RESOURCE_DELETE 0x0040
+ #define PERM_RESOURCE_ADMIN 0x0080
+
+ #define PERM_INTERNAL_DEBUG 0x0100
+ #define PERM_INTERNAL_IMPERSONATE 0x0200
+
+ #define AUDIT_POLICY_STRICT 1
+ #define AUDIT_POLICY_VERBOSE 2
+ EOF
+ cat >new <<-\EOF &&
+ #define LIMIT_PUBLIC_UPLOADS 25
+ #define LIMIT_PUBLIC_INVITES 8
+
+ #define PERM_INTERNAL_DEBUG 0x0100
+ #define PERM_INTERNAL_IMPERSONATE 0x0200
+
+ #define AUDIT_POLICY_STRICT 1
+ #define AUDIT_POLICY_VERBOSE 2
+
+ /* Public resource permissions. */
+ #define PERM_RESOURCE_READ 0x0001
+ #define PERM_RESOURCE_LIST 0x0002
+ #define PERM_RESOURCE_COMMENT 0x0004
+ #define PERM_RESOURCE_EXPORT 0x0001
+ #define PERM_RESOURCE_SHARE 0x0010
+ #define PERM_RESOURCE_ARCHIVE 0x0020
+ #define PERM_RESOURCE_DELETE 0x0040
+ #define PERM_RESOURCE_ADMIN 0x0080
+ EOF
+ test_must_fail git diff --no-index --histogram --word-diff-align old new >actual &&
+ test_grep "^-#define PERM_RESOURCE_EXPORT\\[-.*0x0008-\\]" actual &&
+ test_grep "^+#define PERM_RESOURCE_EXPORT{+.*0x0001+}" actual
+'
+
test_expect_success '--word-diff=plain --color' '
cat >expect <<-EOF &&
<BOLD>diff --git a/pre b/post<RESET>
--
2.39.3 (Apple Git-146)
prev parent reply other threads:[~2026-05-27 4:24 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-05-27 4:23 [RFC PATCH 0/3] diff: pair edited lines inside moved blocks Keita Oda
2026-05-27 4:24 ` [RFC PATCH 1/3] diff: add word-diff-align line pairing Keita Oda
2026-05-27 4:24 ` [RFC PATCH 2/3] diff: render word-diff-align pairs for RFC review Keita Oda
2026-05-27 4:24 ` Keita Oda [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=20260527042402.13607-4-ainsophyao@gmail.com \
--to=ainsophyao@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox