t6023: merge-file fails to output anything for a degenerate merge

diff --git a/test-path-utils.c b/test-path-utils.c
index 842b58018f7efebf7f92cee117d1a0b50297a12e..2c0f5a37e8b9051b1db80aa04e9ea763fb8d772b 100644 (file)
--- a/test-path-utils.c
+++ b/test-path-utils.c
@@ -3,7 +3,7 @@
 int main(int argc, char **argv)
 {
        if (argc == 3 && !strcmp(argv[1], "normalize_absolute_path")) {
-               char *buf = xmalloc(strlen(argv[2])+1);
+               char *buf = xmalloc(PATH_MAX + 1);
                int rv = normalize_absolute_path(buf, argv[2]);
                assert(strlen(buf) == rv);
                puts(buf);
@@ -17,5 +17,10 @@ int main(int argc, char **argv)
                }
        }
 
+       if (argc == 4 && !strcmp(argv[1], "longest_ancestor_length")) {
+               int len = longest_ancestor_length(argv[2], argv[3]);
+               printf("%d\n", len);
+       }
+
        return 0;
 }