sha1_file: convert cached object code to struct object_id

diff --git a/git-rebase.sh b/git-rebase.sh
index 6edf8c5b19137c096030de3b4c4512865016c4eb..fb64ee1fe42e801a57f1709c15617ddbc27f05af 100755 (executable)
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -197,7 +197,7 @@ run_specific_rebase () {
                autosquash=
        fi
        . git-rebase--$type
-       git_rebase__$type
+       git_rebase__$type${preserve_merges:+__preserve_merges}
        ret=$?
        if test $ret -eq 0
        then