summaryrefslogtreecommitdiff
path: root/builtin/am.c
diff options
context:
space:
mode:
authorElijah Newren <newren@gmail.com>2023-05-16 06:33:57 (GMT)
committerJunio C Hamano <gitster@pobox.com>2023-06-21 20:39:53 (GMT)
commitbc5c5ec0446895f5c4139cd470066beb3c4ac6d5 (patch)
tree3634954efc29ed76b389c90b0b357c0c96ed425e /builtin/am.c
parent08c46a499aec5b6459fb1d55ff90403c7dc2ee5a (diff)
downloadgit-bc5c5ec0446895f5c4139cd470066beb3c4ac6d5.zip
git-bc5c5ec0446895f5c4139cd470066beb3c4ac6d5.tar.gz
git-bc5c5ec0446895f5c4139cd470066beb3c4ac6d5.tar.bz2
cache.h: remove this no-longer-used header
Since this header showed up in some places besides just #include statements, update/clean-up/remove those other places as well. Note that compat/fsmonitor/fsm-path-utils-darwin.c previously got away with violating the rule that all files must start with an include of git-compat-util.h (or a short-list of alternate headers that happen to include it first). This change exposed the violation and caused it to stop building correctly; fix it by having it include git-compat-util.h first, as per policy. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/am.c')
-rw-r--r--builtin/am.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/builtin/am.c b/builtin/am.c
index 0d8f46f..2f0f233 100644
--- a/builtin/am.c
+++ b/builtin/am.c
@@ -4,11 +4,10 @@
* Based on git-am.sh by Junio C Hamano.
*/
#define USE_THE_INDEX_VARIABLE
-#include "cache.h"
+#include "builtin.h"
#include "abspath.h"
#include "advice.h"
#include "config.h"
-#include "builtin.h"
#include "editor.h"
#include "environment.h"
#include "exec-cmd.h"