Merge branch 'mg/patch-id' into maint

diff --git a/git.c b/git.c
index d532576cdff244fcd3945ef4fcc580e1bf0b04ae..68334f6a3134bb76a8ffc59e4da773400c59a388 100644 (file)
--- a/git.c
+++ b/git.c
@@ -275,6 +275,10 @@ static int run_builtin(struct cmd_struct *p, int argc, const char **argv)
                        use_pager = check_pager_config(p->cmd);
                if (use_pager == -1 && p->option & USE_PAGER)
                        use_pager = 1;
+
+               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);
        }
        commit_pager_choice();