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 /fast-import.c | |
| parent | fa5bc8abb35e34f673c41cb5c66d0a2f21536861 (diff) | |
| parent | 25655221745fd27d5da3bda7ad0fe49f2005d776 (diff) | |
| download | git-ed096c4a23476810831e12d2e9227403c21bd774.tar.gz | |
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 'fast-import.c')
| -rw-r--r-- | fast-import.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/fast-import.c b/fast-import.c index f0e08aca70..1935206be0 100644 --- a/fast-import.c +++ b/fast-import.c @@ -150,6 +150,7 @@ Format of STDIN stream: #include "refs.h" #include "csum-file.h" #include "quote.h" +#include "exec_cmd.h" #define PACK_ID_BITS 16 #define MAX_PACK_ID ((1<<PACK_ID_BITS)-1) @@ -2406,6 +2407,8 @@ int main(int argc, const char **argv) { unsigned int i, show_stats = 1; + git_extract_argv0_path(argv[0]); + setup_git_directory(); git_config(git_pack_config, NULL); if (!pack_compression_seen && core_compression_seen) |