Merge branch 'ns/rebase-noverify'

diff --git a/contrib/examples/git-commit.sh b/contrib/examples/git-commit.sh
index 485339754ca3567c86b824af656700654c68e173..5c72f655c7e4fb1bd18e979d33bd94062fce8c1a 100755 (executable)
--- a/contrib/examples/git-commit.sh
+++ b/contrib/examples/git-commit.sh
@@ -74,6 +74,7 @@ trap '
 
 all=
 also=
+allow_empty=f
 interactive=
 only=
 logfile=
@@ -114,6 +115,10 @@ do
        -a|--a|--al|--all)
                all=t
                ;;
+       --allo|--allow|--allow-|--allow-e|--allow-em|--allow-emp|\
+       --allow-empt|--allow-empty)
+               allow_empty=t
+               ;;
        --au=*|--aut=*|--auth=*|--autho=*|--author=*)
                force_author="${1#*=}"
                ;;
@@ -438,7 +443,7 @@ fi | git stripspace >"$GIT_DIR"/COMMIT_EDITMSG
 
 case "$signoff" in
 t)
-       sign=$(git-var GIT_COMMITTER_IDENT | sed -e '
+       sign=$(git var GIT_COMMITTER_IDENT | sed -e '
                s/>.*/>/
                s/^/Signed-off-by: /
                ')
@@ -515,18 +520,23 @@ else
        # we need to check if there is anything to commit
        run_status >/dev/null
 fi
-if [ "$?" != "0" -a ! -f "$GIT_DIR/MERGE_HEAD" ]
-then
+case "$allow_empty,$?,$PARENTS" in
+t,* | ?,0,* | ?,*,-p' '?*-p' '?*)
+       # an explicit --allow-empty, or a merge commit can record the
+       # same tree as its parent.  Otherwise having commitable paths
+       # is required.
+       ;;
+*)
        rm -f "$GIT_DIR/COMMIT_EDITMSG" "$GIT_DIR/SQUASH_MSG"
        use_status_color=t
        run_status
        exit 1
-fi
+esac
 
 case "$no_edit" in
 '')
-       git-var GIT_AUTHOR_IDENT > /dev/null  || die
-       git-var GIT_COMMITTER_IDENT > /dev/null  || die
+       git var GIT_AUTHOR_IDENT > /dev/null  || die
+       git var GIT_COMMITTER_IDENT > /dev/null  || die
        git_editor "$GIT_DIR/COMMIT_EDITMSG"
        ;;
 esac