From: Eric Sunshine Date: Mon, 17 Nov 2014 01:40:12 GMT Subject: Re: [PATCH v2 1/2] create_default_files(): don't set u+x bit on $GIT_DIR/config Message-ID: In-Reply-To: <1416122508-30654-2-git-send-email-mhagger@alum.mit.edu> On Sun, Nov 16, 2014 at 2:21 AM, Michael Haggerty wrote: > 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 test code didn't set the u+x bit back to its original state > itself, instead relying on the subsequent call to git_config_set() to > re-write the config file with correct permissions. > > But ever since > > daa22c6f8d config: preserve config file permissions on edits (2014-05-06) > > git_config_set() copies the permissions from the old config file to > the new one. This is a good change in and of itself, but it interacts > badly with create_default_files()'s sloppiness, causing "git init" to > leave the executable bit set on $GIT_DIR/config. > > So change create_default_files() to reset the permissions on > $GIT_DIR/config after its test. > > Signed-off-by: Michael Haggerty > --- Should this patch include a test in t1300 to ensure that this bug does not resurface (and to prove that this patch indeed fixes it)? > builtin/init-db.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/builtin/init-db.c b/builtin/init-db.c > index 56f85e2..4c8021d 100644 > --- a/builtin/init-db.c > +++ b/builtin/init-db.c > @@ -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); > } > git_config_set("core.filemode", filemode ? "true" : "false"); > > -- > 2.1.1