mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Junio C Hamano
2023-07-17 11:30:42 -07:00
parent d5bb430ec6 91c080dff5
commit ce481ac8b3
147 changed files with 327 additions and 478 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/merge.c
View File

@ -10,7 +10,6 @@
#include "builtin.h"
#include "abspath.h"
#include "advice.h"
#include "alloc.h"
#include "config.h"
#include "editor.h"
#include "environment.h"
@ -53,7 +52,6 @@
#include "commit-reach.h"
#include "wt-status.h"
#include "commit-graph.h"
#include "wrapper.h"
#define DEFAULT_TWOHEAD (1<<0)
#define DEFAULT_OCTOPUS (1<<1)