rebase -i: rewrite write_basic_state() in C

[thirdparty/git.git] / git-rebase--interactive.sh

diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 08e9a21c2f15f44f7541667a2e3a8d911071bb4b..6367da66e2dd05a2b0ab0091bd20ad742eceedec 100644 (file)
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -57,7 +57,6 @@ init_basic_state () {
        rm -f "$(git rev-parse --git-path REBASE_HEAD)"
 
        : > "$state_dir"/interactive || die "$(gettext "Could not mark as interactive")"
-       write_basic_state
 }
 
 git_rebase__interactive () {
@@ -70,6 +69,12 @@ git_rebase__interactive () {
        git rebase--helper --prepare-branch "$switch_to" ${verbose:+--verbose}
        init_basic_state
 
+       git rebase--helper --init-basic-state ${upstream:+--upstream "$upstream"} \
+               ${onto:+--onto "$onto"} ${head_name:+--head-name "$head_name"} \
+               ${verbose:+--verbose} ${strategy:+--strategy "$strategy"} \
+               ${strategy_opts:+--strategy-opts="$strategy_opts"} \
+               "$allow_rerere_autoupdate" "$gpg_sign_opt" "$signoff" || exit
+
        git rebase--helper --make-script ${keep_empty:+--keep-empty} \
                ${rebase_merges:+--rebase-merges} \
                ${rebase_cousins:+--rebase-cousins} \