undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

trace: give repo_setup trace its own key

Browse Source 
You no longer get this output with GIT_TRACE=1; instead, you
can do GIT_TRACE_SETUP=1.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King 2011-02-24 09:30:30 -05:00 committed by Junio C Hamano
parent bbc30f9963
commit 7e2342d098
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
t/t1510-repo-setup.sh
View File

@ -57,7 +57,7 @@ test_repo () {
export GIT_WORK_TREE export GIT_WORK_TREE
fi && fi &&
rm -f trace && rm -f trace &&
GIT_TRACE="$(pwd)/trace" git symbolic-ref HEAD >/dev/null && GIT_TRACE_SETUP="$(pwd)/trace" git symbolic-ref HEAD >/dev/null &&
grep '^setup: ' trace >result && grep '^setup: ' trace >result &&
test_cmp expected result test_cmp expected result
) )

11
trace.c
View File

@ -155,10 +155,11 @@ static const char *quote_crnl(const char *path)
/* FIXME: move prefix to startup_info struct and get rid of this arg */ /* FIXME: move prefix to startup_info struct and get rid of this arg */
void trace_repo_setup(const char *prefix) void trace_repo_setup(const char *prefix)
{ {
static const char *key = "GIT_TRACE_SETUP";
const char *git_work_tree; const char *git_work_tree;
char cwd[PATH_MAX]; char cwd[PATH_MAX];
if (!trace_want("GIT_TRACE")) if (!trace_want(key))
return; return;
if (!getcwd(cwd, PATH_MAX)) if (!getcwd(cwd, PATH_MAX))
@ -170,10 +171,10 @@ void trace_repo_setup(const char *prefix)
if (!prefix) if (!prefix)
prefix = "(null)"; prefix = "(null)";
trace_printf("setup: git_dir: %s\n", quote_crnl(get_git_dir())); trace_printf_key(key, "setup: git_dir: %s\n", quote_crnl(get_git_dir()));
trace_printf("setup: worktree: %s\n", quote_crnl(git_work_tree)); trace_printf_key(key, "setup: worktree: %s\n", quote_crnl(git_work_tree));
trace_printf("setup: cwd: %s\n", quote_crnl(cwd)); trace_printf_key(key, "setup: cwd: %s\n", quote_crnl(cwd));
trace_printf("setup: prefix: %s\n", quote_crnl(prefix)); trace_printf_key(key, "setup: prefix: %s\n", quote_crnl(prefix));
} }
int trace_want(const char *key) int trace_want(const char *key)