diff options
author | Jared Hance <jaredhance@gmail.com> | 2012-03-02 21:31:13 -0500 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-03-02 23:31:22 -0800 |
commit | 59ca173d034d467ac899684eaf0638b1a5a83c66 (patch) | |
tree | c526554bd1ddea8459c8cc12a39adcd5f4333478 | |
parent | 70eb130768d17c33b9efbf60d7953cf6a57daecb (diff) | |
download | git-jh/trace-use-startup-info.tar.gz |
Use startup_info->prefix rather than prefix.jh/trace-use-startup-info
In trace_repo_setup, prefix is passed in as startup_info->prefix. But, as
indicated but a FIXME comment, trace_repo_setup has access to
startup_info. The prefix parameter has therefor been eliminated.
Signed-off-by: Jared Hance <jaredhance@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r-- | cache.h | 2 | ||||
-rw-r--r-- | git.c | 2 | ||||
-rw-r--r-- | trace.c | 10 |
3 files changed, 7 insertions, 7 deletions
@@ -1201,7 +1201,7 @@ extern void trace_printf(const char *format, ...); extern void trace_vprintf(const char *key, const char *format, va_list ap); __attribute__((format (printf, 2, 3))) extern void trace_argv_printf(const char **argv, const char *format, ...); -extern void trace_repo_setup(const char *prefix); +extern void trace_repo_setup(void); extern int trace_want(const char *key); extern void trace_strbuf(const char *key, const struct strbuf *buf); @@ -296,7 +296,7 @@ static int run_builtin(struct cmd_struct *p, int argc, const char **argv) if ((p->option & (RUN_SETUP | RUN_SETUP_GENTLY)) && startup_info->have_repository) /* get_git_dir() may set up repo, avoid that */ - trace_repo_setup(prefix); + trace_repo_setup(); } commit_pager_choice(); @@ -152,8 +152,7 @@ static const char *quote_crnl(const char *path) return new_path; } -/* FIXME: move prefix to startup_info struct and get rid of this arg */ -void trace_repo_setup(const char *prefix) +void trace_repo_setup(void) { static const char *key = "GIT_TRACE_SETUP"; const char *git_work_tree; @@ -168,13 +167,14 @@ void trace_repo_setup(const char *prefix) if (!(git_work_tree = get_git_work_tree())) git_work_tree = "(null)"; - if (!prefix) - prefix = "(null)"; + if (!startup_info->prefix) + startup_info->prefix = "(null)"; trace_printf_key(key, "setup: git_dir: %s\n", quote_crnl(get_git_dir())); trace_printf_key(key, "setup: worktree: %s\n", quote_crnl(git_work_tree)); trace_printf_key(key, "setup: cwd: %s\n", quote_crnl(cwd)); - trace_printf_key(key, "setup: prefix: %s\n", quote_crnl(prefix)); + trace_printf_key(key, "setup: prefix: %s\n", + quote_crnl(startup_info->prefix)); } int trace_want(const char *key) |