git-for-windows/git
1
0
Fork 0
mirror of https://github.com/git-for-windows/git.git synced 2026-04-21 15:30:15 -05:00
Code Issues Packages Projects Releases 335 Wiki Activity

Merge branch 'rs/blame-ignore-colors-fix'

Browse Source 
"git blame --ignore-revs=... --color-lines" did not account for
ignored revisions passing blame to the same commit an adjacent line
gets blamed for.

* rs/blame-ignore-colors-fix:
  blame: fix coloring for repeated suspects
This commit is contained in:
Junio C Hamano
2026-02-11 12:29:08 -08:00
parent ea03b35bb5 d519082d4e
commit 06cef761b1
2 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
builtin/blame.c
View File

@@ -454,7 +454,8 @@ static void determine_line_heat(struct commit_info *ci, const char **dest_color)
*dest_color = colorfield[i].col;
}
static void emit_other(struct blame_scoreboard *sb, struct blame_entry *ent, int opt)
static void emit_other(struct blame_scoreboard *sb, struct blame_entry *ent,
int opt, struct blame_entry *prev_ent)
{
int cnt;
const char *cp;
@@ -485,7 +486,10 @@ static void emit_other(struct blame_scoreboard *sb, struct blame_entry *ent, int
the_hash_algo->hexsz : (size_t) abbrev;
if (opt & OUTPUT_COLOR_LINE) {
if (cnt > 0) {
if (cnt > 0 ||
(prev_ent &&
oideq(&suspect->commit->object.oid,
&prev_ent->suspect->commit->object.oid))) {
color = repeated_meta_color;
reset = GIT_COLOR_RESET;
} else {
@@ -571,7 +575,7 @@ static void emit_other(struct blame_scoreboard *sb, struct blame_entry *ent, int
static void output(struct blame_scoreboard *sb, int option)
{
struct blame_entry *ent;
struct blame_entry *ent, *prev_ent = NULL;
if (option & OUTPUT_PORCELAIN) {
for (ent = sb->ent; ent; ent = ent->next) {
@@ -593,7 +597,8 @@ static void output(struct blame_scoreboard *sb, int option)
if (option & OUTPUT_PORCELAIN)
emit_porcelain(sb, ent, option);
else {
emit_other(sb, ent, option);
emit_other(sb, ent, option, prev_ent);
prev_ent = ent;
}
}
}

14
t/t8012-blame-colors.sh
View File

@@ -28,6 +28,20 @@ test_expect_success 'colored blame colors contiguous lines' '
test_line_count = 3 H.expect
'
test_expect_success 'color lines becoming contiguous due to --ignore-rev' '
mv hello.c hello.orig &&
sed "s/ / /g" <hello.orig >hello.c &&
git add hello.c &&
git commit -m"tabs to spaces" &&
git -c color.blame.repeatedLines=yellow blame --color-lines --ignore-rev=HEAD hello.c >actual.raw &&
test_decode_color <actual.raw >actual &&
grep "<YELLOW>" <actual >darkened &&
grep "(F" darkened > F.expect &&
grep "(H" darkened > H.expect &&
test_line_count = 2 F.expect &&
test_line_count = 3 H.expect
'
test_expect_success 'color by age consistently colors old code' '
git blame --color-by-age hello.c >actual.raw &&
git -c blame.coloring=highlightRecent blame hello.c >actual.raw.2 &&