merge(3p/git): Merge git upstream at v2.26.2
This commit is contained in:
commit
5229c9b232
1006 changed files with 149006 additions and 60819 deletions
2
third_party/git/trace.c
vendored
2
third_party/git/trace.c
vendored
|
|
@ -88,8 +88,6 @@ 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;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue