From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 6 Jul 2023 18:54:46 +0000 (-0700)
Subject: Merge branch 'cw/strbuf-cleanup'
X-Git-Tag: v2.42.0-rc0~72
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=67e7305e64fea8d15879e9dc3831fc8e31cfe619;p=thirdparty%2Fgit.git

Merge branch 'cw/strbuf-cleanup'

Move functions that are not about pure string manipulation out of
strbuf.[ch]

* cw/strbuf-cleanup:
  strbuf: remove global variable
  path: move related function to path
  object-name: move related functions to object-name
  credential-store: move related functions to credential-store file
  abspath: move related functions to abspath
  strbuf: clarify dependency
  strbuf: clarify API boundary
---

67e7305e64fea8d15879e9dc3831fc8e31cfe619
diff --cc builtin/notes.c
index 0a19796f73,3bad5b458b..fa1b91609f
--- a/builtin/notes.c
+++ b/builtin/notes.c
@@@ -7,9 -7,11 +7,10 @@@
   * and builtin/tag.c by Kristian Høgsberg and Carlos Rica.
   */
  
 -#include "cache.h"
 -#include "config.h"
  #include "builtin.h"
 +#include "config.h"
  #include "editor.h"
+ #include "environment.h"
  #include "gettext.h"
  #include "hex.h"
  #include "notes.h"
diff --cc builtin/stripspace.c
index 397d7fe2dc,1987752359..7b700a9fb1
--- a/builtin/stripspace.c
+++ b/builtin/stripspace.c
@@@ -1,5 -1,7 +1,6 @@@
  #include "builtin.h"
 -#include "cache.h"
  #include "config.h"
+ #include "environment.h"
  #include "gettext.h"
  #include "parse-options.h"
  #include "setup.h"
diff --cc dir.h
index 461f0971e4,4d83febe9e..ad06682fd5
--- a/dir.h
+++ b/dir.h
@@@ -7,6 -6,6 +7,8 @@@
  #include "statinfo.h"
  #include "strbuf.h"
  
++struct repository;
++
  /**
   * The directory listing API is used to enumerate paths in the work tree,
   * optionally taking `.git/info/exclude` and `.gitignore` files per directory