Merge branch 'maint'

diff --git a/git-gc.sh b/git-gc.sh
index 3e8c87c814baaef650484cdd77484858c09e29c4..436d7caff5c26f7c0ff8c0a410bdabccdec0a900 100755 (executable)
--- a/git-gc.sh
+++ b/git-gc.sh
@@ -4,7 +4,7 @@
 #
 # Cleanup unreachable files and optimize the repository.
 
-USAGE='git-gc [--prune]'
+USAGE='[--prune]'
 SUBDIRECTORY_OK=Yes
 . git-sh-setup
 
@@ -22,6 +22,14 @@ do
        shift
 done
 
+case "$(git config --get gc.packrefs)" in
+notbare|"")
+       test $(is_bare_repository) = true || pack_refs=true;;
+*)
+       pack_refs=$(git config --bool --get gc.packrefs)
+esac
+
+test "true" != "$pack_refs" ||
 git-pack-refs --prune &&
 git-reflog expire --all &&
 git-repack -a -d -l &&