Merge branch 'po/everyday-doc' into maint

diff --git a/t/t1410-reflog.sh b/t/t1410-reflog.sh
index 3b657c422665bce1a89bc8eb0e0225bf89b4e5b8..8cf446165eff431106dd86d01754633fbd3ce246 100755 (executable)
--- a/t/t1410-reflog.sh
+++ b/t/t1410-reflog.sh
@@ -245,6 +245,14 @@ test_expect_success 'gc.reflogexpire=false' '
 
 '
 
+test_expect_success 'checkout should not delete log for packed ref' '
+       test $(git reflog master | wc -l) = 4 &&
+       git branch foo &&
+       git pack-refs --all &&
+       git checkout foo &&
+       test $(git reflog master | wc -l) = 4
+'
+
 test_expect_success 'stale dirs do not cause d/f conflicts (reflogs on)' '
        test_when_finished "git branch -d one || git branch -d one/two" &&