Reintegrate: move sequencer code out of the output

diff --git a/Reintegrate b/Reintegrate
index b95f12cef3446449fa65b09596ae1e60b0d7d618..d9f14f2363ff837d9130d373a9a6250dc291dd3b 100755 (executable)
--- a/Reintegrate
+++ b/Reintegrate
@@ -1,56 +1,60 @@
 #!/bin/sh
 
-merge_msg="Merge branch '\(.*\)'"
-x40='[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]'
-x40="$x40$x40$x40$x40$x40$x40$x40$x40"
-LF='
-'
-
-echo '#!/bin/sh
-accept_rerere=t
-while case "$#,$1" in 0,*) break;; *,-*) ;; *) break ;; esac
+accept_rerere=t generate=no
+while case "$#,$1" in 0,*) break;; *,-*) ;; esac
 do
        case "$1" in
        -n)     accept_rerere= ;;
-       *)      echo "$0 [-n]"; exit 1 ;;
+       *)      generate=yes
+               break ;;
        esac
        shift
 done
 
-accept_rerere () {
-       if test -z "$accept_rerere"
-       then
-               return 1
-       fi
-       if git diff |
-          grep -e "^.+" -e "^+." |
-          grep -e "^..<<<<<<<" -e "^..=======" -e "^..>>>>>>>" >/dev/null
-       then
-               return 1
-       else
-               EDITOR=: git commit -a --no-verify
-               return 0
-       fi
-}
-
-while read branch eh
-do
-       case "$eh" in
-       "")
-               echo >&2 "* $branch"
-               git merge "$branch" || accept_rerere || exit
-               if git show-ref -q --verify "refs/merge-fix/$branch"
+case "$generate" in
+no)
+       accept_rerere () {
+               if test -z "$accept_rerere"
                then
-                       git cherry-pick --no-commit "refs/merge-fix/$branch" &&
-                       EDITOR=: git commit --amend -a
+                       return 1
                fi
-               ;;
-       pick" "*)
-               echo >&2 "* $eh"
-               git cherry-pick "$branch" || exit ;;
-       *) echo >&2 "Eh? $branch $eh"; exit ;;
-       esac
-done <<EOF'
+               if git diff |
+                  grep -e "^.+" -e "^+." |
+                  grep -e "^..<<<<<<<" -e "^..=======" -e "^..>>>>>>>" >/dev/null
+               then
+                       return 1
+               else
+                       EDITOR=: git commit -a --no-verify
+                       return 0
+               fi
+       }
+
+       while read branch eh
+       do
+               case "$eh" in
+               "")
+                       echo >&2 "* $branch"
+                       git merge "$branch" || accept_rerere || exit
+                       if git show-ref -q --verify "refs/merge-fix/$branch"
+                       then
+                               git cherry-pick --no-commit "refs/merge-fix/$branch" &&
+                               EDITOR=: git commit --amend -a
+                       fi
+                       ;;
+               pick" "*)
+                       echo >&2 "* $eh"
+                       git cherry-pick "$branch" || exit ;;
+               *) echo >&2 "Eh? $branch $eh"; exit ;;
+               esac
+       done
+       exit
+esac
+
+merge_msg="Merge branch '\(.*\)'"
+x40='[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]'
+x40="$x40$x40$x40$x40$x40$x40$x40$x40"
+LF='
+'
 
 show_merge () {
        branch=$(expr "$msg" : "$merge_msg") &&
@@ -67,6 +71,9 @@ show_pick () {
        merged="$(git rev-parse --verify "$commit") pick $msg" 
 }
 
+echo '#!/bin/sh'
+echo "$0 <<\\EOF"
+
 git log --pretty=oneline --first-parent "$1" |
 {
        series=
@@ -89,4 +96,4 @@ git log --pretty=oneline --first-parent "$1" |
        echo "$series"
 }
 
-echo 'EOF'
+echo EOF