From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 27 Mar 2026 18:00:03 +0000 (-0700)
Subject: Merge branch 'jc/rerere-modern-strbuf-handling'
X-Git-Tag: v2.54.0-rc0~19
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7241be412367d60c69b1eb7eb979be5935bed646;p=thirdparty%2Fgit.git

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
---

7241be412367d60c69b1eb7eb979be5935bed646
diff --cc tools/coccinelle/strbuf.cocci
index 83bd93be5f,13f0ad2679..f586128329
--- a/tools/coccinelle/strbuf.cocci
+++ b/tools/coccinelle/strbuf.cocci
@@@ -61,13 -61,9 +61,20 @@@ expression E1, E2
  - strbuf_addstr(E1, real_path(E2));
  + strbuf_add_real_path(E1, E2);
  
 +@@
 +identifier fn, param;
 +@@
 +  fn(...,
 +- struct strbuf param
 ++ struct strbuf *param
 +  ,...)
 +  {
 +  ...
 +  }
++
+ // In modern codebase, .buf member of an empty strbuf is not NULL.
+ @@
+ struct strbuf SB;
+ @@
+ - SB.buf ? SB.buf : ""
+ + SB.buf