merge-recursive: adjust to loosened "working file clobbered" check

diff --git a/trace.c b/trace.c
index ce01c3474948ec593c87843309ec767ace57f07e..495e5ed92a68837a8abbd1569b2ccb59a3d50429 100644 (file)
--- a/trace.c
+++ b/trace.c
@@ -55,7 +55,8 @@ static int get_trace_fd(int *need_close)
 {
        char *trace = getenv("GIT_TRACE");
 
-       if (!trace || !strcmp(trace, "0") || !strcasecmp(trace," false"))
+       if (!trace || !strcmp(trace, "") ||
+           !strcmp(trace, "0") || !strcasecmp(trace, "false"))
                return 0;
        if (!strcmp(trace, "1") || !strcasecmp(trace, "true"))
                return STDERR_FILENO;