kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'jc/rerere-modern-strbuf-handling' 

Code clean-up overdue by 19 years.

* jc/rerere-modern-strbuf-handling:
  cocci: strbuf.buf is never NULL
  rerere: update to modern representation of empty strbufs
maint
Junio C Hamano 2026-03-27 11:00:03 -07:00
parent 18396dc97d f64c50e768
commit 7241be4123
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
rerere.c
View File

@ -403,12 +403,8 @@ static int handle_conflict(struct strbuf *out, struct rerere_io *io,
strbuf_addbuf(out, &two);
rerere_strbuf_putconflict(out, '>', marker_size);
if (ctx) {
git_hash_update(ctx, one.buf ?
one.buf : "",
one.len + 1);
git_hash_update(ctx, two.buf ?
two.buf : "",
two.len + 1);
git_hash_update(ctx, one.buf, one.len + 1);
git_hash_update(ctx, two.buf, two.len + 1);
}
break;
} else if (hunk == RR_SIDE_1)

7
tools/coccinelle/strbuf.cocci
View File

@ -71,3 +71,10 @@ identifier fn, param;
{
...
}

// In modern codebase, .buf member of an empty strbuf is not NULL.
@@
struct strbuf SB;
@@
- SB.buf ? SB.buf : ""
+ SB.buf