diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-11-11 14:46:31 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-11-11 14:49:50 -0800 |
| commit | 8bb4646dae89035695e72a39d6fe1c0f364ea0aa (patch) | |
| tree | 1bb31c78644ac1eb034212b97f3730733286ebae /environment.c | |
| parent | a9645b780b698703cd7dee25051d6ce39b0544c6 (diff) | |
| parent | 9db56f71b91153f4076a796c80c61f00edd8b700 (diff) | |
| download | git-8bb4646dae89035695e72a39d6fe1c0f364ea0aa.tar.gz | |
Merge branch 'maint'
* maint:
Fix non-literal format in printf-style calls
git-submodule: Avoid printing a spurious message.
git ls-remote: make usage string match manpage
Makefile: help people who run 'make check' by mistake
Diffstat (limited to 'environment.c')
| -rw-r--r-- | environment.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/environment.c b/environment.c index bf93a598d0..bb96ac0a71 100644 --- a/environment.c +++ b/environment.c @@ -118,7 +118,7 @@ const char *get_git_work_tree(void) work_tree = git_work_tree_cfg; /* make_absolute_path also normalizes the path */ if (work_tree && !is_absolute_path(work_tree)) - work_tree = xstrdup(make_absolute_path(git_path(work_tree))); + work_tree = xstrdup(make_absolute_path(git_path("%s", work_tree))); } else if (work_tree) work_tree = xstrdup(make_absolute_path(work_tree)); git_work_tree_initialized = 1; |