diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-01-31 17:43:59 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-01-31 17:43:59 -0800 |
| commit | ed096c4a23476810831e12d2e9227403c21bd774 (patch) | |
| tree | 7a5173cf1d2eed820f92a4e30e85713c0352e55b /merge-tree.c | |
| parent | Merge branch 'jk/signal-cleanup' (diff) | |
| parent | Windows: Revert to default paths and convert them by RUNTIME_PREFIX (diff) | |
| download | tgif-ed096c4a23476810831e12d2e9227403c21bd774.tar.xz | |
Merge branch 'sp/runtime-prefix'
* sp/runtime-prefix:
Windows: Revert to default paths and convert them by RUNTIME_PREFIX
Compute prefix at runtime if RUNTIME_PREFIX is set
Modify setup_path() to only add git_exec_path() to PATH
Add calls to git_extract_argv0_path() in programs that call git_config_*
git_extract_argv0_path(): Move check for valid argv0 from caller to callee
Refactor git_set_argv0_path() to git_extract_argv0_path()
Move computation of absolute paths from Makefile to runtime (in preparation for RUNTIME_PREFIX)
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]); |