The 'git-blame(1)' command allows users to ignore specific revisions via
the '--ignore-rev <rev>' and '--ignore-revs-file <file>' flags. These
flags are often combined with the 'blame.markIgnoredLines' and
'blame.markUnblamableLines' config options. These config options prefix
ignored and unblamable lines with a '?' and '*', respectively.
However, this option was never extended to the porcelain mode of
'git-blame(1)'. Since the documentation does not indicate this
exclusion, it is a bug.
Fix this by ensuring porcelain mode also prints the markers and add
tests to verify the behavior.
Signed-off-by: Karthik Nayak <karthik.188@xxxxxxxxx>
---
builtin/blame.c | 10 ++++++++++
t/t8013-blame-ignore-revs.sh | 30 ++++++++++++++++++++++++++++++
2 files changed, 40 insertions(+)
Karthik Nayak (1):
blame: fix unblamable and ignored lines in porcelain mode
base-commit: 683c54c999c301c2cd6f715c411407c413b1d84e
change-id: 20250321-514-git-blame-1-s-porcelain-output-does-not-emit-unblamable-and-ignored-markers-4af46f02847e
Thanks
- Karthik
---
---
builtin/blame.c | 10 ++++++++++
t/t8013-blame-ignore-revs.sh | 30 ++++++++++++++++++++++++++++++
2 files changed, 40 insertions(+)
diff --git a/builtin/blame.c b/builtin/blame.c
index c470654c7e..9a8d7ce7af 100644
--- a/builtin/blame.c
+++ b/builtin/blame.c
@@ -360,6 +360,11 @@ static void emit_porcelain(struct blame_scoreboard *sb, struct blame_entry *ent,
struct blame_origin *suspect = ent->suspect;
char hex[GIT_MAX_HEXSZ + 1];
+ if (mark_unblamable_lines && ent->unblamable)
+ putchar('*');
+ if (mark_ignored_lines && ent->ignored)
+ putchar('?');
+
oid_to_hex_r(hex, &suspect->commit->object.oid);
printf("%s %d %d %d\n",
hex,
@@ -372,6 +377,11 @@ static void emit_porcelain(struct blame_scoreboard *sb, struct blame_entry *ent,
for (cnt = 0; cnt < ent->num_lines; cnt++) {
char ch;
if (cnt) {
+ if (mark_unblamable_lines && ent->unblamable)
+ putchar('*');
+ if (mark_ignored_lines && ent->ignored)
+ putchar('?');
+
printf("%s %d %d\n", hex,
ent->s_lno + 1 + cnt,
ent->lno + 1 + cnt);
diff --git a/t/t8013-blame-ignore-revs.sh b/t/t8013-blame-ignore-revs.sh
index 370b768149..2722eb4598 100755
--- a/t/t8013-blame-ignore-revs.sh
+++ b/t/t8013-blame-ignore-revs.sh
@@ -158,6 +158,16 @@ test_expect_success mark_unblamable_lines '
test_cmp expect actual
'
+test_expect_success 'mark_unblamable_lines porcelain' '
+ sha=$(git rev-parse Y) &&
+
+ git -c blame.markUnblamableLines=false blame -p --ignore-rev Y file >blame_raw &&
+ sed "s/^${sha}/*${sha}/g" blame_raw >expect &&
+
+ git -c blame.markUnblamableLines=true blame -p --ignore-rev Y file >actual &&
+ test_cmp expect actual
+'
+
# Commit Z will touch the first two lines. Y touched all four.
# A--B--X--Y--Z
# The blame output when ignoring Z should be:
@@ -191,6 +201,26 @@ test_expect_success mark_ignored_lines '
! test_cmp expect actual
'
+test_expect_success 'mark_ignored_lines porcelain' '
+ sha=$(git rev-parse Y) &&
+
+ git -c blame.markIgnoredLines=true blame -p --ignore-rev Z file | grep $sha >blame_raw &&
+
+ echo "?" >expect &&
+
+ sed -n "1p" blame_raw | cut -c1 >actual &&
+ test_cmp expect actual &&
+
+ sed -n "2p" blame_raw | cut -c1 >actual &&
+ test_cmp expect actual &&
+
+ sed -n "3p" blame_raw | cut -c1 >actual &&
+ ! test_cmp expect actual &&
+
+ sed -n "4p" blame_raw | cut -c1 >actual &&
+ ! test_cmp expect actual
+'
+
# For ignored revs that added 'unblamable' lines and more recent commits changed
# the blamable lines, mark the unblamable lines with a
# '*'
