Hi Johannes,

Le 18/01/2019 à 16:09, Johannes Schindelin via GitGitGadget a écrit :
> -%<-
> +static int run_am(struct rebase_options *opts)
> +{
> -%<-
> +
> +     if (!status) {
> +             return move_to_original_branch(opts);
> +     }
> +
> +     if (is_directory(opts->state_dir))
> +             write_basic_state(opts);
> +
> +     return status;
> +}
> +

This means that the state directory will be created only if there is a
problem (ie. a conflict), not if the user cancels the rebase by hitting
^C.  In this case, the user will be left in a corrupted state where the
builtin rebase cannot abort the rebase properly.

-- Alban

Reply via email to