Merge branch 'ks/difftool-dir-diff-copy-fix'

diff --git a/t/t3211-peel-ref.sh b/t/t3211-peel-ref.sh
index d4d7792eae845096f8f89ef4d31171d55dac5659..3b7caca4212ea8ee99e8dba8955eab73f0e2f3df 100755 (executable)
--- a/t/t3211-peel-ref.sh
+++ b/t/t3211-peel-ref.sh
@@ -61,4 +61,13 @@ test_expect_success 'refs are peeled outside of refs/tags (old packed)' '
        test_cmp expect actual
 '
 
+test_expect_success 'peeled refs survive deletion of packed ref' '
+       git pack-refs --all &&
+       cp .git/packed-refs fully-peeled &&
+       git branch yadda &&
+       git pack-refs --all &&
+       git branch -d yadda &&
+       test_cmp fully-peeled .git/packed-refs
+'
+
 test_done