]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'ep/remove-duplicated-includes'
authorJunio C Hamano <gitster@pobox.com>
Wed, 23 Mar 2022 21:09:30 +0000 (14:09 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 23 Mar 2022 21:09:30 +0000 (14:09 -0700)
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

1  2 
builtin/sparse-checkout.c
builtin/stash.c
t/helper/test-run-command.c

Simple merge
diff --cc builtin/stash.c
index 242e73cbb09619ee4255d3962174ecbab1f1f8aa,548048f4443032bb55f613c655e7ed2603bdaf0d..ccdfdab44be6c492a6b1942354afab14850a0c00
@@@ -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
  
Simple merge