Merge branch 'da/difftool' into maint

diff --git a/archive-tar.c b/archive-tar.c
index 501ca97760b1f62ada876d372bd1abbbc41c6cd0..cb99df28142f164da62f5a728eb9019e57804157 100644 (file)
--- a/archive-tar.c
+++ b/archive-tar.c
@@ -181,7 +181,7 @@ static void prepare_header(struct archiver_args *args,
        memcpy(header->magic, "ustar", 6);
        memcpy(header->version, "00", 2);
 
-       snprintf(header->chksum, sizeof(header->chksum), "%07o", ustar_header_chksum(header));
+       xsnprintf(header->chksum, sizeof(header->chksum), "%07o", ustar_header_chksum(header));
 }
 
 static int write_extended_header(struct archiver_args *args,