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

diff --cc add-patch.c
Simple merge

diff --cc builtin/am.c
Simple merge

diff --cc builtin/branch.c
Simple merge

diff --cc builtin/commit.c
Simple merge

diff --cc builtin/credential-store.c
Simple merge

diff --cc builtin/merge.c
Simple merge

diff --cc builtin/notes.c
index 0a19796f734df1104ef90199b6e06b8068d2c8b6,3bad5b458bb17c7c7723910f985ed69930a77757..fa1b91609faf34d153b255af3dae6445a8994eb3
--- 1/builtin/notes.c
--- 2/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/rebase.c
Simple merge

diff --cc builtin/stripspace.c
index 397d7fe2dcd1ce1ad36697b805a0ef990918ad8b,1987752359c95a4d5ffa644d22853eded96bf020..7b700a9fb1c2a355af6ee6935edbeec49f3f4135
--- 1/builtin/stripspace.c
--- 2/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 builtin/tag.c
Simple merge

diff --cc dir.h
index 461f0971e4a174355fb7761f68f2e37e2729a168,4d83febe9e72b96839e58e405b66c9e4eacc31d7..ad06682fd54b3e7ae47d6f8a8d80048da0324f01
--- 1/dir.h
--- 2/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

diff --cc fmt-merge-msg.c
Simple merge

diff --cc object-name.c
Simple merge

diff --cc path.c
Simple merge

diff --cc pretty.c
Simple merge

diff --cc sequencer.c
Simple merge

diff --cc strbuf.c
Simple merge

diff --cc strbuf.h
Simple merge

diff --cc wt-status.c
Simple merge