undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-config: handle --file option with relative pathname properly

Browse Source 
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@smarden.org>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
This commit is contained in:
Gerrit Pape 2007-10-12 11:32:51 +00:00 committed by Shawn O. Pearce
parent 60fcc2e6ce
commit 1ae14a6b52
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
builtin-config.c
View File

@ -165,7 +165,7 @@ int cmd_config(int argc, const char **argv, const char *prefix)
{ {
int nongit = 0; int nongit = 0;
char* value; char* value;
setup_git_directory_gently(&nongit); const char *file = setup_git_directory_gently(&nongit);
while (1 < argc) { while (1 < argc) {
if (!strcmp(argv[1], "--int")) if (!strcmp(argv[1], "--int"))
@ -192,7 +192,12 @@ int cmd_config(int argc, const char **argv, const char *prefix)
else if (!strcmp(argv[1], "--file") || !strcmp(argv[1], "-f")) { else if (!strcmp(argv[1], "--file") || !strcmp(argv[1], "-f")) {
if (argc < 3) if (argc < 3)
usage(git_config_set_usage); 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--; argc--;
argv++; argv++;
} }