Merge branch 'master' into db/fetch-pack

[git.git] / builtin-config.c

diff --git a/builtin-config.c b/builtin-config.c
index cb7e9e9391e33073efcf39f432acb760994244e8..d98b6c2c4cbbec367e498d33c5f670709dcac893 100644 (file)
--- 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"))
@@ -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")) {
                        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++;
                }