From: Keita Oda Date: Wed, 27 May 2026 04:24:02 GMT Subject: [RFC PATCH 3/3] t4034: cover moved-and-edited word diff alignment Message-ID: <20260527042402.13607-4-ainsophyao@gmail.com> In-Reply-To: <20260527042402.13607-1-ainsophyao@gmail.com> From: Keita ODA 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 && diff --git a/pre b/post -- 2.39.3 (Apple Git-146)