X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=merge-tree.c;h=f18201acdb21f7eb3e09a546382417851b572fd4;hb=35fb0e8633217f602360a9987af51c4b960e7850;hp=2d1413efbbc33c51fd4820933dcb54164e12d706;hpb=edacb101ef831cdc59d07015b1b5cd1aaddcc588;p=git.git diff --git a/merge-tree.c b/merge-tree.c index 2d1413efb..f18201acd 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 "; 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]);