format-patch: respect --stat in cover letter's diffstat

diff --git a/t/t5309-pack-delta-cycles.sh b/t/t5309-pack-delta-cycles.sh
index 1640bf776421fecf6fa2e43677349a6389586213..491556dad9792619974851ef255198c5d247af2f 100755 (executable)
--- a/t/t5309-pack-delta-cycles.sh
+++ b/t/t5309-pack-delta-cycles.sh
@@ -4,6 +4,12 @@ test_description='test index-pack handling of delta cycles in packfiles'
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-pack.sh
 
+if ! test_have_prereq SHA1
+then
+       skip_all='not using SHA-1 for objects'
+       test_done
+fi
+
 # Two similar-ish objects that we have computed deltas between.
 A=01d7713666f4de822776c7622c10f1b07de280dc
 B=e68fe8129b546b101aee9510c5328e7f21ca1d18
@@ -56,4 +62,22 @@ test_expect_success 'index-pack detects REF_DELTA cycles' '
        test_must_fail git index-pack --fix-thin --stdin <cycle.pack
 '
 
+test_expect_failure 'failover to an object in another pack' '
+       clear_packs &&
+       git index-pack --stdin <ab.pack &&
+       git index-pack --stdin --fix-thin <cycle.pack
+'
+
+test_expect_failure 'failover to a duplicate object in the same pack' '
+       clear_packs &&
+       {
+               pack_header 3 &&
+               pack_obj $A $B &&
+               pack_obj $B $A &&
+               pack_obj $A
+       } >recoverable.pack &&
+       pack_trailer recoverable.pack &&
+       git index-pack --fix-thin --stdin <recoverable.pack
+'
+
 test_done