Re: [PATCH v2 2/2] config: clear the executable bits (if any) on $GIT_DIR/config
- From
Johannes Sixt <j6t@kdbg.org>
- Date
- Nov 16, 2014, 08:06 UTC
- Message-ID
- <54685B05.90007@kdbg.org>
- In-Reply-To
- <1416122508-30654-3-git-send-email-mhagger@alum.mit.edu>
Am 16.11.2014 um 08:21 schrieb Michael Haggerty:
Show 20 quoted lines
> @@ -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?
Show 5 quoted lines
> + chmod(config_file, st.st_mode & 07666);
> + free(config_file);
> }
> else if (actions == ACTION_SET) {
> int ret;-- Hannes