From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 17 Jul 2023 18:30:42 +0000 (-0700)
Subject: Merge branch 'cw/compat-util-header-cleanup'
X-Git-Tag: v2.42.0-rc0~49
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ce481ac8b31c9061eeecd1ba0d7174b621f96632;p=thirdparty%2Fgit.git

Merge branch 'cw/compat-util-header-cleanup'

Further shuffling of declarations across header files to streamline
file dependencies.

* cw/compat-util-header-cleanup:
  git-compat-util: move alloc macros to git-compat-util.h
  treewide: remove unnecessary includes for wrapper.h
  kwset: move translation table from ctype
  sane-ctype.h: create header for sane-ctype macros
  git-compat-util: move wrapper.c funcs to its header
  git-compat-util: move strbuf.c funcs to its header
---

ce481ac8b31c9061eeecd1ba0d7174b621f96632
diff --cc gpg-interface.c
index f7c1d385c1,cb171a853b..48f43c5a21
--- a/gpg-interface.c
+++ b/gpg-interface.c
@@@ -12,11 -12,8 +12,10 @@@
  #include "sigchain.h"
  #include "tempfile.h"
  #include "alias.h"
- #include "wrapper.h"
 +#include "environment.h"
  
 -static int git_gpg_config(const char *, const char *, void *);
 +static int git_gpg_config(const char *, const char *,
 +			  const struct config_context *, void *);
  
  static void gpg_interface_lazy_init(void)
  {
diff --cc strbuf.c
index b41d343ed0,5d06ff026e..f65d7bee4c
--- a/strbuf.c
+++ b/strbuf.c
@@@ -1,8 -1,12 +1,7 @@@
  #include "git-compat-util.h"
- #include "alloc.h"
 -#include "abspath.h"
 -#include "environment.h"
  #include "gettext.h"
  #include "hex.h"
 -#include "object-name.h"
 -#include "refs.h"
 -#include "path.h"
 -#include "repository.h"
 +#include "strbuf.h"
  #include "string-list.h"
  #include "utf8.h"
  #include "date.h"