[Outreachy] remove all the inclusions of git-compat-util.h in header files
diff mbox series

Message ID 20181008170505.GA13134@manohar-ssh
State New
Headers show
Series
  • [Outreachy] remove all the inclusions of git-compat-util.h in header files
Related show

Commit Message

Ananya Krishna Maram Oct. 8, 2018, 5:05 p.m. UTC
Hi All, 
I was searching through #leftovers and found this.
https://public-inbox.org/git/CABPp-BGVVXcbZX44er6TO-PUsfEN_6GNYJ1U5cuoN9deaA48OQ@mail.gmail.com/

This patch address the task discussed in the above link. 

From: Ananya Krishan Maram <ananyakittu1997@gmail.com>

skip the #include of git-compat-util.h since all .c files include it.

Signed-off-by: Ananya Krishna Maram <ananyakittu1997@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(-)

Comments

Derrick Stolee Oct. 8, 2018, 5:13 p.m. UTC | #1
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_6GNYJ1U5cuoN9deaA48OQ@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 <ananyakittu1997@gmail.com>
>
> skip the #include of git-compat-util.h since all .c files include it.
>
> Signed-off-by: Ananya Krishna Maram <ananyakittu1997@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;
> diff --git a/commit-graph.h b/commit-graph.h
> index b05047676..0e93c2bed 100644
> --- a/commit-graph.h
> +++ b/commit-graph.h
> @@ -1,7 +1,6 @@
>   #ifndef COMMIT_GRAPH_H
>   #define COMMIT_GRAPH_H
>   
> -#include "git-compat-util.h"
>   #include "repository.h"
>   #include "string-list.h"
>   #include "cache.h"
> diff --git a/hash.h b/hash.h
> index 7c8238bc2..9a4334c5d 100644
> --- a/hash.h
> +++ b/hash.h
> @@ -1,7 +1,6 @@
>   #ifndef HASH_H
>   #define HASH_H
>   
> -#include "git-compat-util.h"
>   
>   #if defined(SHA1_PPC)
>   #include "ppc/sha1.h"
> diff --git a/pkt-line.h b/pkt-line.h
> index 5b28d4347..fdd316494 100644
> --- a/pkt-line.h
> +++ b/pkt-line.h
> @@ -1,7 +1,6 @@
>   #ifndef PKTLINE_H
>   #define PKTLINE_H
>   
> -#include "git-compat-util.h"
>   #include "strbuf.h"
>   
>   /*
> diff --git a/t/helper/test-tool.h b/t/helper/test-tool.h
> index e07495727..24e0a1589 100644
> --- a/t/helper/test-tool.h
> +++ b/t/helper/test-tool.h
> @@ -1,7 +1,6 @@
>   #ifndef __TEST_TOOL_H__
>   #define __TEST_TOOL_H__
>   
> -#include "git-compat-util.h"
>   
>   int cmd__chmtime(int argc, const char **argv);
>   int cmd__config(int argc, const char **argv);
I applied these changes locally and confirmed the code compiles, so all 
.c files including these _do_ include git-compat-util.h properly.

Thanks,
-Stolee
Ananya Krishna Maram Oct. 9, 2018, 2:16 a.m. UTC | #2
On Mon, 8 Oct 2018 at 22:43, Derrick Stolee <stolee@gmail.com> wrote:
>
> 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_6GNYJ1U5cuoN9deaA48OQ@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 "---"

Sorry, I didn't know that. Shall I re submit the patch with proper commentary.

> that signifies the commit message is over.
> > From: Ananya Krishan Maram <ananyakittu1997@gmail.com>
> >
> > skip the #include of git-compat-util.h since all .c files include it.
> >
> > Signed-off-by: Ananya Krishna Maram <ananyakittu1997@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;
> > diff --git a/commit-graph.h b/commit-graph.h
> > index b05047676..0e93c2bed 100644
> > --- a/commit-graph.h
> > +++ b/commit-graph.h
> > @@ -1,7 +1,6 @@
> >   #ifndef COMMIT_GRAPH_H
> >   #define COMMIT_GRAPH_H
> >
> > -#include "git-compat-util.h"
> >   #include "repository.h"
> >   #include "string-list.h"
> >   #include "cache.h"
> > diff --git a/hash.h b/hash.h
> > index 7c8238bc2..9a4334c5d 100644
> > --- a/hash.h
> > +++ b/hash.h
> > @@ -1,7 +1,6 @@
> >   #ifndef HASH_H
> >   #define HASH_H
> >
> > -#include "git-compat-util.h"
> >
> >   #if defined(SHA1_PPC)
> >   #include "ppc/sha1.h"
> > diff --git a/pkt-line.h b/pkt-line.h
> > index 5b28d4347..fdd316494 100644
> > --- a/pkt-line.h
> > +++ b/pkt-line.h
> > @@ -1,7 +1,6 @@
> >   #ifndef PKTLINE_H
> >   #define PKTLINE_H
> >
> > -#include "git-compat-util.h"
> >   #include "strbuf.h"
> >
> >   /*
> > diff --git a/t/helper/test-tool.h b/t/helper/test-tool.h
> > index e07495727..24e0a1589 100644
> > --- a/t/helper/test-tool.h
> > +++ b/t/helper/test-tool.h
> > @@ -1,7 +1,6 @@
> >   #ifndef __TEST_TOOL_H__
> >   #define __TEST_TOOL_H__
> >
> > -#include "git-compat-util.h"
> >
> >   int cmd__chmtime(int argc, const char **argv);
> >   int cmd__config(int argc, const char **argv);
> I applied these changes locally and confirmed the code compiles, so all
> .c files including these _do_ include git-compat-util.h properly.
>
> Thanks,
> -Stolee
>
Junio C Hamano Oct. 9, 2018, 10:13 a.m. UTC | #3
Derrick Stolee <stolee@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_6GNYJ1U5cuoN9deaA48OQ@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 <ananyakittu1997@gmail.com>
>>
>> skip the #include of git-compat-util.h since all .c files include it.
>>
>> Signed-off-by: Ananya Krishna Maram <ananyakittu1997@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.
Johannes Schindelin Oct. 10, 2018, 8:06 a.m. UTC | #4
Hi Junio & Ananya,

Ananya, I think you did a really good job at contributing your first
patch, demonstrated by the useful comments you already received.

On Tue, 9 Oct 2018, Junio C Hamano wrote:

> Derrick Stolee <stolee@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_6GNYJ1U5cuoN9deaA48OQ@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 <ananyakittu1997@gmail.com>
> >>
> >> skip the #include of git-compat-util.h since all .c files include it.
> >>
> >> Signed-off-by: Ananya Krishna Maram <ananyakittu1997@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.

The mistake -- if any! -- is mine: I suggested to Outreachy students to
look for the #leftoverbits needle in our mail archive haystack, and to
pick something to get a feel for contributing to Git.

Personally, I find the "whoever is picking it up should do the thinking"
much too harsh for a first-time contributor who specifically came through
the Outreachy program, i.e. expected to have a gentle introduction into
the project, and into the ways we work.

Granted, that introduction should have been performed by the potential
mentors (i.e. Chris & I, but I was out sick), but let's face it: we are an
open source project, so every single one of us should feel the call to be
a mentor, and we should certainly try to make every new contributor as
welcome as we would like to be invited into a new project.

In this context, I would think that the "do the thinking" part is
particularly hard because our rules are implicit, and inconsistent: when
do we include header files, when do we skip the include?

If in doubt, follow the age-old wisdom "when in Rome, do as the Romans
do", i.e. ignore the explicitly written-down rules, and instead imitate
what active contributors are doing.

Unfortunately, I have no easy way to suggest for mining the mailing list
for sentiments about including header files. And in any case, it would
probably boil down on personal taste, which -- let's face it -- is rather
diverse in our community... :-)

So in this case, what I would suggest is to look instead for the commit
history, where header files were added or modified. The Git command for
that is:

	git log --no-merges -p \*.h

Apart from the rather wonderful examples you see there for commit messages
(I am a big fan of commit messages that are clear and descriptive, i.e.
start by detailing the why rather than the how, with notes thrown in about
design decisions that are not obvious from the patch), this command will
lead us pretty soon to this commit, especially when looking for the search
term #include:

	https://github.com/git/git/commit/69d846f05381

In other words, we explicitly introduced an `#include "git-compat-util.h"`
in a header there.

The commit message also offers a pretty compelling rationale: it was the
most efficient way to have that header included *first thing* in all test
helpers.

Following that rationale, let's have a look at the patch we are improving
here (because that's what code review really should all be about:
improving the code, putting together all of our expertise to get the best
patch we can in a reasonable amount of time):

The first thing we can already say is that the change to
t/helper/test-tool.h would revert the commit referenced above, so I think
we should drop that change.

Next, I want to have a look at advice.h:

	git grep -O 'advice\.h'

(the backslash is necessary because this is a regular expression, and the
period character has the special meaning "any character" there, unless
escaped by a backslash)

What we can see is that indeed, every file that includes this header
already includes cache.h first. We can even see that cache.h *itself*
includes advice.h, meaning that we could add another patch that drops the
advice.h include from, say, commit.c.

At this point, this seems to become a rabbit hole: which header files are
already included in cache.h that are *also* included (unnecessarily) in .c
files that *already* included cache.h?

Ananya, it is now up to you how far you want to go down that rabbit hole
;-)

If I had the time, *I* would now be tempted to try my hand at writing a
script that analyzes our source code to ensure that:

- "cache.h" or "git-compat-util.h" is the first header included (as per
  that commit message of the commit mentioned above)
- every header that is already included in cache.h is not included by a .c
  file that already included cache.h

It is the kind of side-track I could lose days over, but I have to admit
that the benefit would probably not merit the effort ;-)

In any case, I am delighted by your first patch: you took the first hurdle
:-)

Ciao,
Johannes

P.S.: Please record your contribution on the Outreachy site, unless you
already did...
Junio C Hamano Oct. 10, 2018, 8:46 a.m. UTC | #5
Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:

> Personally, I find the "whoever is picking it up should do the thinking"
> much too harsh for a first-time contributor who specifically came through
> the Outreachy program, i.e. expected to have a gentle introduction into
> the project, and into the ways we work.

Oh, absolutely I agree.

Any random discussion participant can say "left over bits" in any
random message with an idea that is left on the table.  Looking for
it may narrow the set messages to be examined, but the query result
will inevitably be still full of chaff.  It is not a very good match
for "gentle introduction" material for GSoC/Outreachy microprojects.

List of reasonable low-hanging fruits is hard to maintain, as the
cost of building and maintaining such a list would easily outweigh
the cost (and fun) of picking these low-hanging fruits yourself X-<.

I do not think of a good solution to help newcomers offhand.

Thanks, as always, for trying to be helpful to newcomers.
Christian Couder Oct. 10, 2018, 9:13 a.m. UTC | #6
On Wed, Oct 10, 2018 at 10:46 AM Junio C Hamano <gitster@pobox.com> wrote:
>
> Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
>
> > Personally, I find the "whoever is picking it up should do the thinking"
> > much too harsh for a first-time contributor who specifically came through
> > the Outreachy program, i.e. expected to have a gentle introduction into
> > the project, and into the ways we work.
>
> Oh, absolutely I agree.
>
> Any random discussion participant can say "left over bits" in any
> random message with an idea that is left on the table.  Looking for
> it may narrow the set messages to be examined, but the query result
> will inevitably be still full of chaff.  It is not a very good match
> for "gentle introduction" material for GSoC/Outreachy microprojects.
>
> List of reasonable low-hanging fruits is hard to maintain, as the
> cost of building and maintaining such a list would easily outweigh
> the cost (and fun) of picking these low-hanging fruits yourself X-<.
>
> I do not think of a good solution to help newcomers offhand.

In the "How to find other ideas for microprojects" on
https://git.github.io/SoC-2018-Microprojects/ there is already the
following:

"When you find something you are interested to work on, please ask
first on the mailing list if it’s worth doing and if it’s appropriate
for a microproject before starting to work on what you find. Even if
it looks straightforward, there could be hidden reasons why it is too
difficult or just inappropriate."

So I think one solution to this problem is already proposed on our web site.
Junio C Hamano Oct. 10, 2018, 12:22 p.m. UTC | #7
Christian Couder <christian.couder@gmail.com> writes:

> So I think one solution to this problem is already proposed on our web site.

OK, that's a good start.  The next step is to make those who are
involved in these education programs to be more aware of it ;-)

Patch
diff mbox series

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;
diff --git a/commit-graph.h b/commit-graph.h
index b05047676..0e93c2bed 100644
--- a/commit-graph.h
+++ b/commit-graph.h
@@ -1,7 +1,6 @@ 
 #ifndef COMMIT_GRAPH_H
 #define COMMIT_GRAPH_H
 
-#include "git-compat-util.h"
 #include "repository.h"
 #include "string-list.h"
 #include "cache.h"
diff --git a/hash.h b/hash.h
index 7c8238bc2..9a4334c5d 100644
--- a/hash.h
+++ b/hash.h
@@ -1,7 +1,6 @@ 
 #ifndef HASH_H
 #define HASH_H
 
-#include "git-compat-util.h"
 
 #if defined(SHA1_PPC)
 #include "ppc/sha1.h"
diff --git a/pkt-line.h b/pkt-line.h
index 5b28d4347..fdd316494 100644
--- a/pkt-line.h
+++ b/pkt-line.h
@@ -1,7 +1,6 @@ 
 #ifndef PKTLINE_H
 #define PKTLINE_H
 
-#include "git-compat-util.h"
 #include "strbuf.h"
 
 /*
diff --git a/t/helper/test-tool.h b/t/helper/test-tool.h
index e07495727..24e0a1589 100644
--- a/t/helper/test-tool.h
+++ b/t/helper/test-tool.h
@@ -1,7 +1,6 @@ 
 #ifndef __TEST_TOOL_H__
 #define __TEST_TOOL_H__
 
-#include "git-compat-util.h"
 
 int cmd__chmtime(int argc, const char **argv);
 int cmd__config(int argc, const char **argv);