Merge branch 'en/merge-directory-renames-fix'

diff --git a/trace2/tr2_tgt_normal.c b/trace2/tr2_tgt_normal.c
index 1ce6f9786319304f81da0454ecb33c8dac0247f5..00b116d797c844cd7320542a9829e94ee1e0311c 100644 (file)
--- a/trace2/tr2_tgt_normal.c
+++ b/trace2/tr2_tgt_normal.c
@@ -127,7 +127,7 @@ static void fn_atexit(uint64_t us_elapsed_absolute, int code)
 static void maybe_append_string_va(struct strbuf *buf, const char *fmt,
                                   va_list ap)
 {
-       if (fmt && *fmt && ap) {
+       if (fmt && *fmt) {
                va_list copy_ap;
 
                va_copy(copy_ap, ap);