git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH v2 2/2] config: clear the executable bits (if any) on $GIT_DIR/config

From
Michael Haggerty <mhagger@alum.mit.edu>
Date
Nov 17, 2014, 09:03 UTC
Message-ID
<5469B9FE.5070001@alum.mit.edu>
In-Reply-To
<54685B05.90007@kdbg.org>
On 11/16/2014 09:06 AM, Johannes Sixt wrote:
Show 25 quoted lines
> 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?

You make a good point. But I'm a little nervous about following symlinks and changing permissions on some distant file. Also, the bug that we are trying clean up after would not have created a symlink in this place, so I think the cleanup is not so important if "config" is a symlink.

So I suggest that we stick with lstat(), but add S_ISREG(st.st_mode) to the && chain above. Does that sound reasonable?

Show 5 quoted lines
>> +			chmod(config_file, st.st_mode & 07666);
>> +		free(config_file);
>>  	}
>>  	else if (actions == ACTION_SET) {
>>  		int ret;
Michael
-- 
Michael Haggerty
mhagger@alum.mit.edu
Previous: Johannes Sixt
Message 14 of 14 in “Don't make $GIT_DIR executable”
  1. 0/2 Don't make $GIT_DIR executableMichael Haggerty, Nov 16, 2014
  2. 1/2 create_default_files(): don't set u+x bit on $GIT_DIR/configMichael Haggerty, Nov 16, 2014
  3. Junio C HamanoNov 16, 2014
  4. Michael HaggertyNov 17, 2014
  5. Eric SunshineNov 17, 2014
  6. Torsten BögershausenNov 17, 2014
  7. Michael HaggertyNov 17, 2014
  8. Michael HaggertyNov 17, 2014
  9. Junio C HamanoNov 17, 2014
  10. Michael HaggertyNov 17, 2014
  11. Junio C HamanoNov 17, 2014
  12. 2/2 config: clear the executable bits (if any) on $GIT_DIR/configMichael Haggerty, Nov 16, 2014
  13. Johannes SixtNov 16, 2014
  14. Michael HaggertyNov 17, 2014

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.