# [PATCH] git-config: handle --file option with relative pathname properly 5 messages from 2007-10-09 to 2007-10-12. Participants: Gerrit Pape, Johannes Schindelin, Johannes Sixt. Thread: https://gitlist.dev/t/10210 ## Gerrit Pape, 2007-10-09 12:49 Subject: [PATCH] git-config: handle --file option with relative pathname properly Message-ID: <20071009124932.1184.qmail@395d4a80f3eafd.315fe32.mid.smarden.org> URL: https://gitlist.dev/e/20071009124932.1184.qmail%40395d4a80f3eafd.315fe32.mid.smarden.org ``` When calling git-config not from the top level directory of a repository, it changes directory before trying to open the config file specified through the --file option, which then fails if the config file was specified by a relative pathname. This patch adjusts the pathname to the config file if applicable. The problem was noticed by Joey Hess, reported through http://bugs.debian.org/445208 Signed-off-by: Gerrit Pape --- builtin-config.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/builtin-config.c b/builtin-config.c index 0a605e0..c2708ba 100644 --- a/builtin-config.c +++ b/builtin-config.c @@ -165,7 +165,7 @@ int cmd_config(int argc, const char **argv, const char *prefix) { int nongit = 0; char* value; - setup_git_directory_gently(&nongit); + const char *name = setup_git_directory_gently(&nongit); while (1 < argc) { if (!strcmp(argv[1], "--int")) @@ -189,7 +189,11 @@ int cmd_config(int argc, const char **argv, const char *prefix) else if (!strcmp(argv[1], "--file") || !strcmp(argv[1], "-f")) { if (argc < 3) usage(git_config_set_usage); - setenv(CONFIG_ENVIRONMENT, argv[2], 1); + if (argv[2][0] == '/') + name = argv[2]; + else + name = name ? prefix_filename(name, strlen(name), argv[2]) : argv[2]; + setenv(CONFIG_ENVIRONMENT, name, 1); argc--; argv++; } -- 1.5.3.4 ``` ## Johannes Schindelin, 2007-10-09 13:14 Subject: Re: [PATCH] git-config: handle --file option with relative pathname properly Message-ID: URL: https://gitlist.dev/e/Pine.LNX.4.64.0710091413500.4174%40racer.site In-Reply-To: <20071009124932.1184.qmail@395d4a80f3eafd.315fe32.mid.smarden.org> ``` Hi, On Tue, 9 Oct 2007, Gerrit Pape wrote: > @@ -189,7 +189,11 @@ int cmd_config(int argc, const char **argv, const char *prefix) > else if (!strcmp(argv[1], "--file") || !strcmp(argv[1], "-f")) { > if (argc < 3) > usage(git_config_set_usage); > - setenv(CONFIG_ENVIRONMENT, argv[2], 1); > + if (argv[2][0] == '/') Please use is_absolute_path() instead. Ciao, Dscho ``` ## Johannes Sixt, 2007-10-09 13:20 Subject: Re: [PATCH] git-config: handle --file option with relative pathname properly Message-ID: <470B8024.2050106@viscovery.net> URL: https://gitlist.dev/e/470B8024.2050106%40viscovery.net In-Reply-To: <20071009124932.1184.qmail@395d4a80f3eafd.315fe32.mid.smarden.org> ``` Gerrit Pape schrieb: > @@ -189,7 +189,11 @@ int cmd_config(int argc, const char **argv, const char *prefix) > else if (!strcmp(argv[1], "--file") || !strcmp(argv[1], "-f")) { > if (argc < 3) > usage(git_config_set_usage); > - setenv(CONFIG_ENVIRONMENT, argv[2], 1); > + if (argv[2][0] == '/') Please use is_absolute_path() here. > + name = argv[2]; > + else > + name = name ? prefix_filename(name, strlen(name), argv[2]) : argv[2]; Can't you avoid this ternary here? There's already an 'if' with the same 'else' branch. > + setenv(CONFIG_ENVIRONMENT, name, 1); > argc--; > argv++; > } -- Hannes ``` ## Gerrit Pape, 2007-10-12 11:32 Subject: [PATCH amend] git-config: handle --file option with relative pathname properly Message-ID: <20071012113251.29941.qmail@7584201f340355.315fe32.mid.smarden.org> URL: https://gitlist.dev/e/20071012113251.29941.qmail%407584201f340355.315fe32.mid.smarden.org In-Reply-To: <470B8024.2050106@viscovery.net> ``` When calling git-config not from the top level directory of a repository, it changes directory before trying to open the config file specified through the --file option, which then fails if the config file was specified by a relative pathname. This patch adjusts the pathname to the config file if applicable. The problem was noticed by Joey Hess, reported through http://bugs.debian.org/445208 Signed-off-by: Gerrit Pape --- On Tue, Oct 09, 2007 at 03:20:36PM +0200, Johannes Sixt wrote: > Gerrit Pape schrieb: > >- setenv(CONFIG_ENVIRONMENT, argv[2], 1); > >+ if (argv[2][0] == '/') > > Please use is_absolute_path() here. Okay. > >+ name = argv[2]; > >+ else > >+ name = name ? prefix_filename(name, > >strlen(name), argv[2]) : argv[2]; > > Can't you avoid this ternary here? There's already an 'if' with the same > 'else' branch. Sure, thanks, Gerrit. builtin-config.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/builtin-config.c b/builtin-config.c index 0a605e0..4444d52 100644 --- a/builtin-config.c +++ b/builtin-config.c @@ -165,7 +165,7 @@ int cmd_config(int argc, const char **argv, const char *prefix) { int nongit = 0; char* value; - setup_git_directory_gently(&nongit); + const char *file = setup_git_directory_gently(&nongit); while (1 < argc) { if (!strcmp(argv[1], "--int")) @@ -189,7 +189,12 @@ int cmd_config(int argc, const char **argv, const char *prefix) else if (!strcmp(argv[1], "--file") || !strcmp(argv[1], "-f")) { if (argc < 3) usage(git_config_set_usage); - setenv(CONFIG_ENVIRONMENT, argv[2], 1); + if (!is_absolute_path(argv[2]) && file) + file = prefix_filename(file, strlen(file), + argv[2]); + else + file = argv[2]; + setenv(CONFIG_ENVIRONMENT, file, 1); argc--; argv++; } -- 1.5.3.4 ``` ## Johannes Schindelin, 2007-10-12 12:08 Subject: Re: [PATCH amend] git-config: handle --file option with relative pathname properly Message-ID: URL: https://gitlist.dev/e/Pine.LNX.4.64.0710121308040.25221%40racer.site In-Reply-To: <20071012113251.29941.qmail@7584201f340355.315fe32.mid.smarden.org> ``` Hi, On Fri, 12 Oct 2007, Gerrit Pape wrote: > - setup_git_directory_gently(&nongit); > + const char *file = setup_git_directory_gently(&nongit); One last nit (because I did not see it earlier): please call the variable "prefix", not "file". Other than that, I think your patch is obviously correct. Thanks, Dscho ```