diff options
| author | Steffen Prohaska <prohaska@zib.de> | 2009-01-18 13:00:12 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-01-26 00:26:05 -0800 |
| commit | 2fb3f6db96492b680899f9e40f434eeb4c778a84 (patch) | |
| tree | 34fc6bc48403648216d8864fabcf28effb14c15a /merge-tree.c | |
| parent | 2cd72b0b290e40fb4d6a925ce26603503f01aa09 (diff) | |
| download | git-2fb3f6db96492b680899f9e40f434eeb4c778a84.tar.gz | |
Add calls to git_extract_argv0_path() in programs that call git_config_*
Programs that use git_config need to find the global configuration.
When runtime prefix computation is enabled, this requires that
git_extract_argv0_path() is called early in the program's main().
This commit adds the necessary calls.
Signed-off-by: Steffen Prohaska <prohaska@zib.de>
Acked-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-tree.c')
| -rw-r--r-- | merge-tree.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/merge-tree.c b/merge-tree.c index 2d1413efbb..f18201acdb 100644 --- a/merge-tree.c +++ b/merge-tree.c @@ -2,6 +2,7 @@ #include "tree-walk.h" #include "xdiff-interface.h" #include "blob.h" +#include "exec_cmd.h" static const char merge_tree_usage[] = "git-merge-tree <base-tree> <branch1> <branch2>"; static int resolve_directories = 1; @@ -344,6 +345,8 @@ int main(int argc, char **argv) if (argc != 4) usage(merge_tree_usage); + git_extract_argv0_path(argv[0]); + setup_git_directory(); buf1 = get_tree_descriptor(t+0, argv[1]); |