Merge branch 'xf/user-manual-ff'

diff --git a/t/t6500-gc.sh b/t/t6500-gc.sh
index 63194d819efe07af241573662c660e6e92b503f5..5d7d4146179bb43184f74dd646aacbba11cc8c8b 100755 (executable)
--- a/t/t6500-gc.sh
+++ b/t/t6500-gc.sh
@@ -30,4 +30,17 @@ test_expect_success 'gc -h with invalid configuration' '
        test_i18ngrep "[Uu]sage" broken/usage
 '
 
+test_expect_success 'gc is not aborted due to a stale symref' '
+       git init remote &&
+       (
+               cd remote &&
+               test_commit initial &&
+               git clone . ../client &&
+               git branch -m develop &&
+               cd ../client &&
+               git fetch --prune &&
+               git gc
+       )
+'
+
 test_done