Skip to content

Commit 14fc29d

Browse files
committed
Revert "trace2: collect platform-specific process information"
This reverts commit 3adeefc.
1 parent b607158 commit 14fc29d

File tree

4 files changed

+2
-120
lines changed

4 files changed

+2
-120
lines changed

common-main.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ int main(int argc, const char **argv)
3737

3838
trace2_initialize();
3939
trace2_cmd_start(argv);
40-
trace2_collect_process_info();
4140

4241
git_resolve_executable_dir(argv[0]);
4342

compat/win32/ancestry.c

Lines changed: 0 additions & 102 deletions
This file was deleted.

config.mak.uname

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -424,8 +424,7 @@ ifeq ($(uname_S),Windows)
424424
BASIC_CFLAGS = -nologo -I. -Icompat/vcbuild/include -DWIN32 -D_CONSOLE -DHAVE_STRING_H -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE
425425
COMPAT_OBJS = compat/msvc.o compat/winansi.o \
426426
compat/win32/pthread.o compat/win32/syslog.o \
427-
compat/win32/dirent.o compat/win32/fscache.o \
428-
compat/win32/ancestry.o
427+
compat/win32/dirent.o compat/win32/fscache.o
429428
COMPAT_CFLAGS = -D__USE_MINGW_ACCESS -DDETECT_MSYS_TTY -DNOGDI -DHAVE_STRING_H -Icompat -Icompat/regex -Icompat/win32 -DSTRIP_EXTENSION=\".exe\"
430429
BASIC_LDFLAGS = -IGNORE:4217 -IGNORE:4049 -NOLOGO -ENTRY:wmainCRTStartup -SUBSYSTEM:CONSOLE
431430
# invalidcontinue.obj allows Git's source code to close the same file
@@ -587,8 +586,7 @@ ifneq (,$(findstring MINGW,$(uname_S)))
587586
COMPAT_CFLAGS += -DSTRIP_EXTENSION=\".exe\"
588587
COMPAT_OBJS += compat/mingw.o compat/winansi.o \
589588
compat/win32/pthread.o compat/win32/syslog.o \
590-
compat/win32/dirent.o compat/win32/fscache.o \
591-
compat/win32/ancestry.o
589+
compat/win32/dirent.o compat/win32/fscache.o
592590
BASIC_CFLAGS += -DWIN32 -DPROTECT_NTFS_DEFAULT=1
593591
EXTLIBS += -lws2_32
594592
GITLIBS += git.res

trace2.h

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -387,17 +387,4 @@ __attribute__((format (printf, 1, 2)))
387387
void trace2_printf(const char *fmt, ...);
388388
#endif
389389

390-
/*
391-
* Optional platform-specific code to dump information about the
392-
* current and any parent process(es). This is intended to allow
393-
* post-processors to know who spawned this git instance and anything
394-
* else the platform may be able to tell us about the current process.
395-
*/
396-
#if defined(GIT_WINDOWS_NATIVE)
397-
void trace2_collect_process_info(void);
398-
#else
399-
#define trace2_collect_process_info() \
400-
do {} while (0)
401-
#endif
402-
403390
#endif /* TRACE2_H */

0 commit comments

Comments
 (0)