Derrick Stolee <sto...@gmail.com> writes: > On 10/8/2018 1:05 PM, Ananya Krishna Maram wrote: >> Hi All, > Hello, Ananya! Welcome. > >> I was searching through #leftovers and found this. >> https://public-inbox.org/git/cabpp-bgvvxcbzx44er6to-pusfen_6gnyj1u5cuon9deaa4...@mail.gmail.com/ >> >> This patch address the task discussed in the above link. > The discussion above seems to not be intended for your commit message, > but it does show up when I run `git am` and provide your email as > input. The typical way to avoid this is to place all commentary below > the "---" > that signifies the commit message is over.
>> From: Ananya Krishan Maram <ananyakittu1...@gmail.com> >> >> skip the #include of git-compat-util.h since all .c files include it. >> >> Signed-off-by: Ananya Krishna Maram <ananyakittu1...@gmail.com> >> --- >> advice.h | 1 - >> commit-graph.h | 1 - >> hash.h | 1 - >> pkt-line.h | 1 - >> t/helper/test-tool.h | 1 - >> 5 files changed, 5 deletions(-) >> >> diff --git a/advice.h b/advice.h >> index ab24df0fd..09148baa6 100644 >> --- a/advice.h >> +++ b/advice.h >> @@ -1,7 +1,6 @@ >> #ifndef ADVICE_H >> #define ADVICE_H >> -#include "git-compat-util.h" >> extern int advice_push_update_rejected; >> extern int advice_push_non_ff_current; The way I read the original discussion is "C source that includes compat-util.h shouldn't if it already includes cache.h"; advice.h is not C and does not (should not) include cache.h. The "left over bits" should not be blindly trusted, and besides, Elijah punted to examine and think about each case and left it to others, so whoever is picking it up should do the thinking, not a blind conversion. I am not getting a feeling that this patch was done with careful thinking after checking only this one.