archive-tar: turn length miscalculation warning into BUG

Now that we're confident our pax extended header calculation is correct,
turn the criticality of the assertion up to the maximum, from warning
right up to BUG.  Simplify the test, as the stderr comparison step would
not be reached in case the BUG message is triggered.

Signed-off-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/archive-tar.c b/archive-tar.c
index 29ca21649ee539e358ee584e91f35910eb40619a..e7153c69e7a87322afa8a8614bf6c5796da5a701 100644 (file)
--- a/archive-tar.c
+++ b/archive-tar.c
@@ -158,9 +158,9 @@ static void strbuf_append_ext_header(struct strbuf *sb, const char *keyword,
        strbuf_addch(sb, '\n');
 
        if (len != sb->len - orig_len)
        strbuf_addch(sb, '\n');
 
        if (len != sb->len - orig_len)

-               warning("pax extended header length miscalculated as %"PRIuMAX
-                       ", should be %"PRIuMAX,
-                       (uintmax_t)len, (uintmax_t)(sb->len - orig_len));
+               BUG("pax extended header length miscalculated as %"PRIuMAX
+                   ", should be %"PRIuMAX,
+                   (uintmax_t)len, (uintmax_t)(sb->len - orig_len));

 }
 
 /*
 }
 
 /*

diff --git a/t/t5004-archive-corner-cases.sh b/t/t5004-archive-corner-cases.sh
index 4966a74b4d083f5dfedaaf3c8873d1c06f0a7fac..3e7b23cb32c581b88473b596036517a38c51c9fd 100755 (executable)
--- a/t/t5004-archive-corner-cases.sh
+++ b/t/t5004-archive-corner-cases.sh
@@ -220,8 +220,7 @@ build_tree() {
 test_expect_success 'tar archive with long paths' '
        blob=$(echo foo | git hash-object -w --stdin) &&
        tree=$(build_tree $blob | git mktree) &&
 test_expect_success 'tar archive with long paths' '
        blob=$(echo foo | git hash-object -w --stdin) &&
        tree=$(build_tree $blob | git mktree) &&

-       git archive -o long_paths.tar $tree 2>stderr &&
-       test_must_be_empty stderr
+       git archive -o long_paths.tar $tree

 '
 
 test_done
 '
 
 test_done