From: Johannes Sixt <j6t@kdbg.org>
To: Michael Haggerty <mhagger@alum.mit.edu>,
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 2/2] config: clear the executable bits (if any) on $GIT_DIR/config
Date: Sun, 16 Nov 2014 09:06:29 +0100 [thread overview]
Message-ID: <54685B05.90007@kdbg.org> (raw)
In-Reply-To: <1416122508-30654-3-git-send-email-mhagger@alum.mit.edu>
Am 16.11.2014 um 08:21 schrieb Michael Haggerty:
> @@ -559,9 +562,21 @@ int cmd_config(int argc, const char **argv, const char *prefix)
> if (given_config_source.blob)
> die("editing blobs is not supported");
> git_config(git_default_config, NULL);
> - launch_editor(given_config_source.file ?
> - given_config_source.file : git_path("config"),
> - NULL, NULL);
> + config_file = xstrdup(given_config_source.file ?
> + given_config_source.file : git_path("config"));
> + launch_editor(config_file, NULL, NULL);
> +
> + /*
> + * In git 2.1, there was a bug in "git init" that left
> + * the u+x bit set on the config file. To clean up any
> + * repositories affected by that bug, and just because
> + * it doesn't make sense for a config file to be
> + * executable anyway, clear any executable bits from
> + * the file (on a "best effort" basis):
> + */
> + if (!lstat(config_file, &st) && (st.st_mode & 0111))
At this point we cannot be sure that config_file is a regular file, can
we? It could also be a symbolic link. Wouldn't plain stat() be more
correct then?
> + chmod(config_file, st.st_mode & 07666);
> + free(config_file);
> }
> else if (actions == ACTION_SET) {
> int ret;
-- Hannes
next prev parent reply other threads:[~2014-11-16 8:06 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
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 [this message]
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=54685B05.90007@kdbg.org \
--to=j6t@kdbg.org \
--cc=Matthieu.Moy@imag.fr \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=karsten.blees@gmail.com \
--cc=mhagger@alum.mit.edu \
--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).