X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=git-am.sh;h=2514d07de2ea89598499a35e3e4a2fcc9096bbec;hb=e2b7eaf0ca3897940961d23392d4ff718867ea9f;hp=5599b9358402125e9901cc7dac96d319da16f43c;hpb=7a98869935a3682b5ff9679c92bf9bc12f87d8c5;p=git.git diff --git a/git-am.sh b/git-am.sh index 5599b9358..2514d07de 100755 --- a/git-am.sh +++ b/git-am.sh @@ -107,7 +107,7 @@ dotest=.dotest sign= utf8=t keep= skip= interactive= resolved= binary= resolvemsg= resume= git_apply_opt= -while case "$#" in 0) break;; esac +while test $# != 0 do case "$1" in -d=*|--d=*|--do=*|--dot=*|--dote=*|--dotes=*|--dotest=*) @@ -394,9 +394,7 @@ do stop_here $this fi - echo printf 'Applying %s\n' "$SUBJECT" - echo case "$resolved" in '') @@ -452,10 +450,8 @@ do fi tree=$(git write-tree) && - echo Wrote tree $tree && parent=$(git rev-parse --verify HEAD) && commit=$(git commit-tree $tree -p $parent <"$dotest/final-commit") && - echo Committed: $commit && git update-ref -m "$GIT_REFLOG_ACTION: $SUBJECT" HEAD $commit $parent || stop_here $this @@ -464,6 +460,8 @@ do "$GIT_DIR"/hooks/post-applypatch fi + git gc --auto + go_next done