Merge branch 'jc/autogc' into js/rebase-i

diff --git a/git-merge.sh b/git-merge.sh
index 66e48b3b18061e083021d8a5c15d252fbb1988ff..bf18f582da53200fb422bf35c85c1f05c5f7c88d 100755 (executable)
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -82,6 +82,7 @@ finish () {
                        ;;
                *)
                        git update-ref -m "$rlogm" HEAD "$1" "$head" || exit 1
+                       git gc --auto
                        ;;
                esac
                ;;
@@ -135,7 +136,7 @@ merge_name () {
 case "$#" in 0) usage ;; esac
 
 have_message=
-while case "$#" in 0) break ;; esac
+while test $# != 0
 do
        case "$1" in
        -n|--n|--no|--no-|--no-s|--no-su|--no-sum|--no-summ|\