summaryrefslogtreecommitdiff
path: root/merge-index.c
diff options
context:
space:
mode:
authorSteffen Prohaska <prohaska@zib.de>2009-01-18 12:00:12 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-01-26 08:26:05 (GMT)
commit2fb3f6db96492b680899f9e40f434eeb4c778a84 (patch)
tree34fc6bc48403648216d8864fabcf28effb14c15a /merge-index.c
parent2cd72b0b290e40fb4d6a925ce26603503f01aa09 (diff)
downloadgit-2fb3f6db96492b680899f9e40f434eeb4c778a84.zip
git-2fb3f6db96492b680899f9e40f434eeb4c778a84.tar.gz
git-2fb3f6db96492b680899f9e40f434eeb4c778a84.tar.bz2
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-index.c')
-rw-r--r--merge-index.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/merge-index.c b/merge-index.c
index 7827e87..c00a2b3 100644
--- a/merge-index.c
+++ b/merge-index.c
@@ -1,5 +1,6 @@
#include "cache.h"
#include "run-command.h"
+#include "exec_cmd.h"
static const char *pgm;
static const char *arguments[9];
@@ -93,6 +94,8 @@ int main(int argc, char **argv)
if (argc < 3)
usage("git-merge-index [-o] [-q] <merge-program> (-a | [--] <filename>*)");
+ git_extract_argv0_path(argv[0]);
+
setup_git_directory();
read_cache();