diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-01-27 14:56:25 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-27 14:56:25 -0800 |
| commit | f1694b62bb3a3e1766b92d64a38f61524cc730a0 (patch) | |
| tree | c88a5c4870bc8fec37ba9d2b29ff8a01c2f4eb84 /builtin-config.c | |
| parent | cb21d8f032b3784ffa7b340abbafb8c4b122d2cc (diff) | |
| parent | 65807ee697a28cb30b8ad38ebb8b84cebd3f255d (diff) | |
| download | git-f1694b62bb3a3e1766b92d64a38f61524cc730a0.tar.gz git-f1694b62bb3a3e1766b92d64a38f61524cc730a0.tar.xz | |
Merge branch 'jh/maint-config-file-prefix'
* jh/maint-config-file-prefix:
builtin-config: Fix crash when using "-f <relative path>" from non-root dir
Diffstat (limited to 'builtin-config.c')
| -rw-r--r-- | builtin-config.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-config.c b/builtin-config.c index 2e3ef911d..4bc46b15f 100644 --- a/builtin-config.c +++ b/builtin-config.c @@ -358,7 +358,7 @@ int cmd_config(int argc, const char **argv, const char *unused_prefix) if (!is_absolute_path(given_config_file) && prefix) config_exclusive_filename = prefix_filename(prefix, strlen(prefix), - argv[2]); + given_config_file); else config_exclusive_filename = given_config_file; } |