Merge branch 'mh/rebase-skip-hard'
[gitweb.git] / git-commit.sh
index bb113e858b73945a1c637024277415cc5ad8f436..485339754ca3567c86b824af656700654c68e173 100755 (executable)
@@ -5,6 +5,7 @@
 
 USAGE='[-a | --interactive] [-s] [-v] [--no-verify] [-m <message> | -F <logfile> | (-C|-c) <commit> | --amend] [-u] [-e] [--author <author>] [--template <file>] [[-i | -o] <path>...]'
 SUBDIRECTORY_OK=Yes
+OPTIONS_SPEC=
 . git-sh-setup
 require_work_tree
 
@@ -25,7 +26,8 @@ refuse_partial () {
        exit 1
 }
 
-THIS_INDEX="$GIT_DIR/index"
+TMP_INDEX=
+THIS_INDEX="${GIT_INDEX_FILE:-$GIT_DIR/index}"
 NEXT_INDEX="$GIT_DIR/next-index$$"
 rm -f "$NEXT_INDEX"
 save_index () {
@@ -89,7 +91,7 @@ force_author=
 only_include_assumed=
 untracked_files=
 templatefile="`git config commit.template`"
-while case "$#" in 0) break;; esac
+while test $# != 0
 do
        case "$1" in
        -F|--F|-f|--f|--fi|--fil|--file)
@@ -98,101 +100,71 @@ do
                no_edit=t
                log_given=t$log_given
                logfile="$1"
-               shift
                ;;
        -F*|-f*)
                no_edit=t
                log_given=t$log_given
-               logfile=`expr "z$1" : 'z-[Ff]\(.*\)'`
-               shift
+               logfile="${1#-[Ff]}"
                ;;
        --F=*|--f=*|--fi=*|--fil=*|--file=*)
                no_edit=t
                log_given=t$log_given
-               logfile=`expr "z$1" : 'z-[^=]*=\(.*\)'`
-               shift
+               logfile="${1#*=}"
                ;;
        -a|--a|--al|--all)
                all=t
-               shift
                ;;
        --au=*|--aut=*|--auth=*|--autho=*|--author=*)
-               force_author=`expr "z$1" : 'z-[^=]*=\(.*\)'`
-               shift
+               force_author="${1#*=}"
                ;;
        --au|--aut|--auth|--autho|--author)
                case "$#" in 1) usage ;; esac
                shift
                force_author="$1"
-               shift
                ;;
        -e|--e|--ed|--edi|--edit)
                edit_flag=t
-               shift
                ;;
        -i|--i|--in|--inc|--incl|--inclu|--includ|--include)
                also=t
-               shift
                ;;
        --int|--inte|--inter|--intera|--interac|--interact|--interacti|\
        --interactiv|--interactive)
                interactive=t
-               shift
                ;;
        -o|--o|--on|--onl|--only)
                only=t
-               shift
                ;;
        -m|--m|--me|--mes|--mess|--messa|--messag|--message)
                case "$#" in 1) usage ;; esac
                shift
                log_given=m$log_given
-               if test "$log_message" = ''
-               then
-                   log_message="$1"
-               else
-                   log_message="$log_message
+               log_message="${log_message:+${log_message}
 
-$1"
-               fi
+}$1"
                no_edit=t
-               shift
                ;;
        -m*)
                log_given=m$log_given
-               if test "$log_message" = ''
-               then
-                   log_message=`expr "z$1" : 'z-m\(.*\)'`
-               else
-                   log_message="$log_message
+               log_message="${log_message:+${log_message}
 
-`expr "z$1" : 'z-m\(.*\)'`"
-               fi
+}${1#-m}"
                no_edit=t
-               shift
                ;;
        --m=*|--me=*|--mes=*|--mess=*|--messa=*|--messag=*|--message=*)
                log_given=m$log_given
-               if test "$log_message" = ''
-               then
-                   log_message=`expr "z$1" : 'z-[^=]*=\(.*\)'`
-               else
-                   log_message="$log_message
+               log_message="${log_message:+${log_message}
 
-`expr "z$1" : 'zq-[^=]*=\(.*\)'`"
-               fi
+}${1#*=}"
                no_edit=t
-               shift
                ;;
        -n|--n|--no|--no-|--no-v|--no-ve|--no-ver|--no-veri|--no-verif|\
        --no-verify)
                verify=
-               shift
                ;;
        --a|--am|--ame|--amen|--amend)
                amend=t
                use_commit=HEAD
-               shift
                ;;
        -c)
                case "$#" in 1) usage ;; esac
@@ -200,15 +172,13 @@ $1"
                log_given=t$log_given
                use_commit="$1"
                no_edit=
-               shift
                ;;
        --ree=*|--reed=*|--reedi=*|--reedit=*|--reedit-=*|--reedit-m=*|\
        --reedit-me=*|--reedit-mes=*|--reedit-mess=*|--reedit-messa=*|\
        --reedit-messag=*|--reedit-message=*)
                log_given=t$log_given
-               use_commit=`expr "z$1" : 'z-[^=]*=\(.*\)'`
+               use_commit="${1#*=}"
                no_edit=
-               shift
                ;;
        --ree|--reed|--reedi|--reedit|--reedit-|--reedit-m|--reedit-me|\
        --reedit-mes|--reedit-mess|--reedit-messa|--reedit-messag|\
@@ -218,7 +188,6 @@ $1"
                log_given=t$log_given
                use_commit="$1"
                no_edit=
-               shift
                ;;
        -C)
                case "$#" in 1) usage ;; esac
@@ -226,15 +195,13 @@ $1"
                log_given=t$log_given
                use_commit="$1"
                no_edit=t
-               shift
                ;;
        --reu=*|--reus=*|--reuse=*|--reuse-=*|--reuse-m=*|--reuse-me=*|\
        --reuse-mes=*|--reuse-mess=*|--reuse-messa=*|--reuse-messag=*|\
        --reuse-message=*)
                log_given=t$log_given
-               use_commit=`expr "z$1" : 'z-[^=]*=\(.*\)'`
+               use_commit="${1#*=}"
                no_edit=t
-               shift
                ;;
        --reu|--reus|--reuse|--reuse-|--reuse-m|--reuse-me|--reuse-mes|\
        --reuse-mess|--reuse-messa|--reuse-messag|--reuse-message)
@@ -243,32 +210,26 @@ $1"
                log_given=t$log_given
                use_commit="$1"
                no_edit=t
-               shift
                ;;
        -s|--s|--si|--sig|--sign|--signo|--signof|--signoff)
                signoff=t
-               shift
                ;;
        -t|--t|--te|--tem|--temp|--templ|--templa|--templat|--template)
                case "$#" in 1) usage ;; esac
                shift
                templatefile="$1"
                no_edit=
-               shift
                ;;
        -q|--q|--qu|--qui|--quie|--quiet)
                quiet=t
-               shift
                ;;
        -v|--v|--ve|--ver|--verb|--verbo|--verbos|--verbose)
                verbose=t
-               shift
                ;;
        -u|--u|--un|--unt|--untr|--untra|--untrac|--untrack|--untracke|\
        --untracked|--untracked-|--untracked-f|--untracked-fi|--untracked-fil|\
        --untracked-file|--untracked-files)
                untracked_files=t
-               shift
                ;;
        --)
                shift
@@ -281,6 +242,7 @@ $1"
                break
                ;;
        esac
+       shift
 done
 case "$edit_flag" in t) no_edit= ;; esac
 
@@ -321,9 +283,9 @@ unset only
 case "$all,$interactive,$also,$#" in
 *t,*t,*)
        die "Cannot use -a, --interactive or -i at the same time." ;;
-t,,[1-9]*)
+t,,,[1-9]*)
        die "Paths with -a does not make sense." ;;
-,t,[1-9]*)
+,t,,[1-9]*)
        die "Paths with --interactive does not make sense." ;;
 ,,t,0)
        die "No paths with -i does not make sense." ;;
@@ -441,12 +403,8 @@ esac
 
 if test t = "$verify" && test -x "$GIT_DIR"/hooks/pre-commit
 then
-       if test "$TMP_INDEX"
-       then
-               GIT_INDEX_FILE="$TMP_INDEX" "$GIT_DIR"/hooks/pre-commit
-       else
-               GIT_INDEX_FILE="$USE_INDEX" "$GIT_DIR"/hooks/pre-commit
-       fi || exit
+    GIT_INDEX_FILE="${TMP_INDEX:-${USE_INDEX}}" "$GIT_DIR"/hooks/pre-commit \
+    || exit
 fi
 
 if test "$log_message" != ''
@@ -655,6 +613,7 @@ git rerere
 
 if test "$ret" = 0
 then
+       git gc --auto
        if test -x "$GIT_DIR"/hooks/post-commit
        then
                "$GIT_DIR"/hooks/post-commit