From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 23 Mar 2022 21:09:30 +0000 (-0700)
Subject: Merge branch 'ep/remove-duplicated-includes'
X-Git-Tag: v2.36.0-rc0~45
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d674bf5570b2eed9779a0b8879ae70219f27a2f9;p=thirdparty%2Fgit.git

Merge branch 'ep/remove-duplicated-includes'

Code clean-up.

* ep/remove-duplicated-includes:
  attr.h: remove duplicate struct definition
  t/helper/test-run-command.c: delete duplicate include
  builtin/stash.c: delete duplicate include
  builtin/sparse-checkout.c: delete duplicate include
  builtin/gc.c: delete duplicate include
  attr.c: delete duplicate include
---

d674bf5570b2eed9779a0b8879ae70219f27a2f9
diff --cc builtin/stash.c
index 242e73cbb0,548048f444..ccdfdab44b
--- a/builtin/stash.c
+++ b/builtin/stash.c
@@@ -16,8 -16,6 +16,7 @@@
  #include "log-tree.h"
  #include "diffcore.h"
  #include "exec-cmd.h"
- #include "entry.h"
 +#include "reflog.h"
  
  #define INCLUDE_ALL_FILES 2