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

gitster · gitster · commit 7241be412367 · 2026-03-27T11:00:03.000-07:00
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
diff --git a/rerere.c b/rerere.c
@@ -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)
diff --git a/tools/coccinelle/strbuf.cocci b/tools/coccinelle/strbuf.cocci
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -71,3 +71,10 @@ identifier fn, param;`
`71`	`71`	`{`
`72`	`72`	`...`
`73`	`73`	`}`
	`74`	`+`
	`75`	`+// In modern codebase, .buf member of an empty strbuf is not NULL.`
	`76`	`+@@`
	`77`	`+struct strbuf SB;`
	`78`	`+@@`
	`79`	`+- SB.buf ? SB.buf : ""`
	`80`	`++ SB.buf`