diff options
| author | René Scharfe <l.s.r@web.de> | 2019-08-17 19:24:23 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-08-19 20:49:00 +0300 |
| commit | 71d41ff651a54028856c4224777ef405de48ae66 (patch) | |
| tree | 4836fec19c0b4a9138fcccd95671fd7984fd29e3 | |
| parent | 17e9ef00d29b349727e3c710869217a36ad08224 (diff) | |
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>
| -rw-r--r-- | archive-tar.c | 6 | ||||
| -rwxr-xr-x | t/t5004-archive-corner-cases.sh | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/archive-tar.c b/archive-tar.c index 29ca21649e..e7153c69e7 100644 --- 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) - 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 4966a74b4d..3e7b23cb32 100755 --- 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) && - git archive -o long_paths.tar $tree 2>stderr && - test_must_be_empty stderr + git archive -o long_paths.tar $tree ' test_done |