git-p4: add trap to kill p4d on test exit

diff --git a/path.c b/path.c
index c740c4ff9403bc92df4c439839bd5596ac62e48d..f28ace2963bb3f0f76af0e363add22ed73a5a2c9 100644 (file)
--- a/path.c
+++ b/path.c
@@ -363,7 +363,7 @@ void report_linked_checkout_garbage(void)
                strbuf_setlen(&sb, len);
                strbuf_addstr(&sb, path);
                if (file_exists(sb.buf))
-                       report_garbage("unused in linked checkout", sb.buf);
+                       report_garbage(PACKDIR_FILE_GARBAGE, sb.buf);
        }
        strbuf_release(&sb);
 }