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 /index-pack.c | |
| parent | fa5bc8abb35e34f673c41cb5c66d0a2f21536861 (diff) | |
| parent | 25655221745fd27d5da3bda7ad0fe49f2005d776 (diff) | |
| download | git-ed096c4a23476810831e12d2e9227403c21bd774.tar.gz git-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 'index-pack.c')
| -rw-r--r-- | index-pack.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/index-pack.c b/index-pack.c index b46a6d659..f7a38079e 100644 --- a/index-pack.c +++ b/index-pack.c @@ -8,6 +8,7 @@ #include "tree.h" #include "progress.h" #include "fsck.h" +#include "exec_cmd.h" static const char index_pack_usage[] = "git index-pack [-v] [-o <index-file>] [{ ---keep | --keep=<msg> }] [--strict] { <pack-file> | --stdin [--fix-thin] [<pack-file>] }"; @@ -880,6 +881,8 @@ int main(int argc, char **argv) struct pack_idx_entry **idx_objects; unsigned char pack_sha1[20]; + git_extract_argv0_path(argv[0]); + /* * We wish to read the repository's config file if any, and * for that it is necessary to call setup_git_directory_gently(). |