about summary refs log tree commit diff
path: root/third_party/git/trace.c
diff options
context:
space:
mode:
authorVincent Ambo <tazjin@google.com>2020-05-25T23·06+0100
committerVincent Ambo <tazjin@google.com>2020-05-25T23·06+0100
commit93ba78d6f4632ef1c5228965e3edc8c0faf88c1e (patch)
tree85730c182a9f5f492ade8e8ccdb1c2356f9900bd /third_party/git/trace.c
parent6f8fbf4aa4b1654ab27d4829e114538761817de0 (diff)
revert(3p/git): Revert merge of git upstream at v2.26.2 r/852
This causes cgit to serve error pages, which is undesirable.

This reverts commit 5229c9b232de5bfa959ad6ebbb4c8192ac513352, reversing
changes made to f2b211131f2347342dde63975b09cf603149f1a3.
Diffstat (limited to 'third_party/git/trace.c')
-rw-r--r--third_party/git/trace.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/third_party/git/trace.c b/third_party/git/trace.c
index b3ef0e627f..fa4a2e7120 100644
--- a/third_party/git/trace.c
+++ b/third_party/git/trace.c
@@ -88,6 +88,8 @@ static int prepare_trace_line(const char *file, int line,
 	if (!trace_want(key))
 		return 0;
 
+	set_try_to_free_routine(NULL);	/* is never reset */
+
 	/* unit tests may want to disable additional trace output */
 	if (trace_want(&trace_bare))
 		return 1;