From: Michael Haggerty <mhagger@alum.mit.edu>
To: Junio C Hamano <gitster@pobox.com>
Cc: "Eric Wong" <normalperson@yhbt.net>,
"Karsten Blees" <karsten.blees@gmail.com>,
"Stefan Beller" <stefanbeller@gmail.com>,
"Torsten Bögershausen" <tboegi@web.de>,
"Matthieu Moy" <Matthieu.Moy@imag.fr>,
git@vger.kernel.org
Subject: Re: [PATCH v2 1/2] create_default_files(): don't set u+x bit on $GIT_DIR/config
Date: Mon, 17 Nov 2014 10:35:18 +0100 [thread overview]
Message-ID: <5469C156.7000907@alum.mit.edu> (raw)
In-Reply-To: <xmqqk32vyndg.fsf@gitster.dls.corp.google.com>
On 11/16/2014 08:08 PM, Junio C Hamano wrote:
> Michael Haggerty <mhagger@alum.mit.edu> writes:
>
>> Since time immemorial, the test of whether to set "core.filemode" has
>> been done by trying to toggle the u+x bit on $GIT_DIR/config and then
>> testing whether the change "took". It is somewhat odd to use the
>> config file for this test, but whatever.
>
> The last sentence should read "We could create a test file and use
> it for this purpose and then remove it, but config is a file we know
> exists at this point in the code (and it is the only file we know
> that exists), so it was a very sensible trick".
>
> Or remove it altogether. In other words, do not sound as if you do
> not know what you are doing in your log message. That would rob
> confidence in the change from the person who is reading "git log"
> output later.
The sentence is not meant to rob confidence in this change, but rather
to stimulate the reader's critical thinking about nearby code that I am
*not* changing.
By making this change without changing the function to use a temporary
file for its chmod experiments, I might otherwise give future readers
the impression that I like this shortcut, which I do not. For example,
if the original code had used a temporary file rather than "config",
then we would never have had the bug that I'm fixing. The "but whatever"
is meant to indicate that I don't disagree so strongly with the choice
of tradeoffs made by the original author that I think it is worth changing.
So maybe I am a coward (or lazy) for not proposing to change to using a
temporary file instead. But since this patch is suggested for maint, I
wanted to make the smallest change that would fix the bug.
Feel free to delete the controversial sentence if you prefer.
>> @@ -255,6 +255,7 @@ static int create_default_files(const char *template_path)
>> filemode = (!chmod(path, st1.st_mode ^ S_IXUSR) &&
>> !lstat(path, &st2) &&
>> st1.st_mode != st2.st_mode);
>> + filemode &= !chmod(path, st1.st_mode);
>
> Sounds good.
>
> You could also &&-chain this "flip it back" to the above statement.
> If filemode is not trustable on a filesytem, doing one extra chmod()
> to correct would not help us anyway, no?
Yes, that would be better. I will fix it.
Michael
--
Michael Haggerty
mhagger@alum.mit.edu
next prev parent reply other threads:[~2014-11-17 9:35 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-16 7:21 [PATCH v2 0/2] Don't make $GIT_DIR executable Michael Haggerty
2014-11-16 7:21 ` [PATCH v2 1/2] create_default_files(): don't set u+x bit on $GIT_DIR/config Michael Haggerty
2014-11-16 19:08 ` Junio C Hamano
2014-11-17 9:35 ` Michael Haggerty [this message]
2014-11-17 1:40 ` Eric Sunshine
2014-11-17 9:08 ` Torsten Bögershausen
2014-11-17 11:32 ` Michael Haggerty
2014-11-17 9:46 ` Michael Haggerty
2014-11-17 15:42 ` Junio C Hamano
2014-11-17 16:19 ` Michael Haggerty
2014-11-17 16:43 ` Junio C Hamano
2014-11-16 7:21 ` [PATCH v2 2/2] config: clear the executable bits (if any) " Michael Haggerty
2014-11-16 8:06 ` Johannes Sixt
2014-11-17 9:03 ` Michael Haggerty
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5469C156.7000907@alum.mit.edu \
--to=mhagger@alum.mit.edu \
--cc=Matthieu.Moy@imag.fr \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=karsten.blees@gmail.com \
--cc=normalperson@yhbt.net \
--cc=stefanbeller@gmail.com \
--cc=tboegi@web.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).