From: Alban Gruin <alban.gruin@gmail.com>
Date: Sat, 26 Jan 2019 21:13:47 GMT
Subject: Re: [PATCH v2 4/4] built-in rebase: call `git am` directly
Message-ID: <dc6830ab-d31c-fb9b-4f8d-24a79a978764@gmail.com>
In-Reply-To: <3c4031868204862ea4e2a53a03cd8d7ec066a891.1547824162.git.gitgitgadget@gmail.com>

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