From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 17 Jul 2021 00:42:51 +0000 (-0700)
Subject: Merge branch 'ar/submodule-helper-include-cleanup'
X-Git-Tag: v2.33.0-rc0~43
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f90efd998121936a4b9a25127045c3985a7c4369;p=thirdparty%2Fgit.git

Merge branch 'ar/submodule-helper-include-cleanup'

Code clean-up.

* ar/submodule-helper-include-cleanup:
  submodule--helper: remove redundant include
---

f90efd998121936a4b9a25127045c3985a7c4369
diff --cc builtin/submodule--helper.c
index ae6174ab05,9f7daf5604..f73963ad67
--- a/builtin/submodule--helper.c
+++ b/builtin/submodule--helper.c
@@@ -13,22 -12,7 +13,21 @@@
  #include "run-command.h"
  #include "remote.h"
  #include "refs.h"
 +#include "refspec.h"
  #include "connect.h"
 +#include "revision.h"
 +#include "diffcore.h"
 +#include "diff.h"
 +#include "object-store.h"
- #include "dir.h"
 +#include "advice.h"
 +
 +#define OPT_QUIET (1 << 0)
 +#define OPT_CACHED (1 << 1)
 +#define OPT_RECURSIVE (1 << 2)
 +#define OPT_FORCE (1 << 3)
 +
 +typedef void (*each_submodule_fn)(const struct cache_entry *list_item,
 +				  void *cb_data);
  
  static char *get_default_remote(void)
  {