Ninth batch for 2.20
[gitweb.git] / git-legacy-rebase.sh
index af2cdfef03d1a7566b1f305b7dc7e9c1ac6708a3..75a08b2683e76e6832475bc91e4d4f38b3d3bc3c 100755 (executable)
@@ -135,26 +135,63 @@ finish_rebase () {
        rm -rf "$state_dir"
 }
 
+run_interactive () {
+       GIT_CHERRY_PICK_HELP="$resolvemsg"
+       export GIT_CHERRY_PICK_HELP
+
+       test -n "$keep_empty" && keep_empty="--keep-empty"
+       test -n "$rebase_merges" && rebase_merges="--rebase-merges"
+       test -n "$rebase_cousins" && rebase_cousins="--rebase-cousins"
+       test -n "$autosquash" && autosquash="--autosquash"
+       test -n "$verbose" && verbose="--verbose"
+       test -n "$force_rebase" && force_rebase="--no-ff"
+       test -n "$restrict_revision" && \
+               restrict_revision="--restrict-revision=^$restrict_revision"
+       test -n "$upstream" && upstream="--upstream=$upstream"
+       test -n "$onto" && onto="--onto=$onto"
+       test -n "$squash_onto" && squash_onto="--squash-onto=$squash_onto"
+       test -n "$onto_name" && onto_name="--onto-name=$onto_name"
+       test -n "$head_name" && head_name="--head-name=$head_name"
+       test -n "$strategy" && strategy="--strategy=$strategy"
+       test -n "$strategy_opts" && strategy_opts="--strategy-opts=$strategy_opts"
+       test -n "$switch_to" && switch_to="--switch-to=$switch_to"
+       test -n "$cmd" && cmd="--cmd=$cmd"
+       test -n "$action" && action="--$action"
+
+       exec git rebase--interactive "$action" "$keep_empty" "$rebase_merges" "$rebase_cousins" \
+               "$upstream" "$onto" "$squash_onto" "$restrict_revision" \
+               "$allow_empty_message" "$autosquash" "$verbose" \
+               "$force_rebase" "$onto_name" "$head_name" "$strategy" \
+               "$strategy_opts" "$cmd" "$switch_to" \
+               "$allow_rerere_autoupdate" "$gpg_sign_opt" "$signoff"
+}
+
 run_specific_rebase () {
        if [ "$interactive_rebase" = implied ]; then
                GIT_EDITOR=:
                export GIT_EDITOR
                autosquash=
        fi
-       . git-rebase--$type
 
-       if test -z "$preserve_merges"
+       if test -n "$interactive_rebase" -a -z "$preserve_merges"
        then
-               git_rebase__$type
+               run_interactive
        else
-               git_rebase__preserve_merges
+               . git-rebase--$type
+
+               if test -z "$preserve_merges"
+               then
+                       git_rebase__$type
+               else
+                       git_rebase__preserve_merges
+               fi
        fi
 
        ret=$?
        if test $ret -eq 0
        then
                finish_rebase
-       elif test $ret -eq 2 # special exit status for rebase -i
+       elif test $ret -eq 2 # special exit status for rebase -p
        then
                apply_autostash &&
                rm -rf "$state_dir" &&
@@ -488,15 +525,15 @@ then
        # Note: incompatibility with --interactive is just a strong warning;
        #       git-rebase.txt caveats with "unless you know what you are doing"
        test -n "$rebase_merges" &&
-               die "$(gettext "error: cannot combine '--preserve_merges' with '--rebase-merges'")"
+               die "$(gettext "error: cannot combine '--preserve-merges' with '--rebase-merges'")"
 fi
 
 if test -n "$rebase_merges"
 then
        test -n "$strategy_opts" &&
-               die "$(gettext "error: cannot combine '--rebase_merges' with '--strategy-option'")"
+               die "$(gettext "error: cannot combine '--rebase-merges' with '--strategy-option'")"
        test -n "$strategy" &&
-               die "$(gettext "error: cannot combine '--rebase_merges' with '--strategy'")"
+               die "$(gettext "error: cannot combine '--rebase-merges' with '--strategy'")"
 fi
 
 if test -z "$rebase_root"