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 <pape@xxxxxxxxxxx> --- 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 - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
