send-pack: allow the same source to be pushed more than once.

diff --git a/git-commit-script b/git-commit-script
index 04d16ae92f6a5d1e36eac9901806faa20f309984..1d59f46b94fd817b87202ab7f053a0d60e03cf20 100755 (executable)
--- a/git-commit-script
+++ b/git-commit-script
@@ -6,7 +6,7 @@
 . git-sh-setup-script || die "Not a git archive"
 
 usage () {
-       die 'git commit [-m existing-commit] [<path>...]'
+       die 'git commit [--all] [-m existing-commit] [<path>...]'
 }
 
 files=()
@@ -16,7 +16,7 @@ do
     -m) shift
         case "$#" in
        0) usage ;;
-       *) use_commit=`git-rev-parse "$1"` ||
+       *) use_commit=`git-rev-parse --verify "$1"` ||
           exit ;;
        esac
        ;;
@@ -86,7 +86,7 @@ else
        fi >.editmsg
        git-status-script >>.editmsg
 fi
-if [ "$?" != "0" ]
+if [ "$?" != "0" -a ! -f $GIT_DIR/MERGE_HEAD ]
 then
        cat .editmsg
        rm .editmsg