Merge branch 'uk/maint-1.5.3-rebase-i-reflog' into maint

diff --git a/t/t3210-pack-refs.sh b/t/t3210-pack-refs.sh
index 087ef75061f4d56fcb6350284d91820485249087..413019acafc98646a61e77960527f042a8f96ac6 100755 (executable)
--- a/t/t3210-pack-refs.sh
+++ b/t/t3210-pack-refs.sh
@@ -96,6 +96,13 @@ test_expect_success \
      git branch -d n/o/p &&
      git branch n'
 
+test_expect_success \
+       'see if up-to-date packed refs are preserved' \
+       'git branch q &&
+        git pack-refs --all --prune &&
+        git update-ref refs/heads/q refs/heads/q &&
+        ! test -f .git/refs/heads/q'
+
 test_expect_success 'pack, prune and repack' '
        git tag foo &&
        git pack-refs --all --prune &&