Re: [PATCH 24/31] rebase: extract code for writing basic state

From: Thomas Rast <trast@student.ethz.ch>
Date: Jan 4, 2011, 19:19 UTC
Message-ID: <201101042019.24223.trast@student.ethz.ch>
In-Reply-To: <1293528648-21873-25-git-send-email-martin.von.zweigbergk@gmail.com>

Martin von Zweigbergk wrote:

> Note that non-interactive rebase stores the sha1 of the original head
> in a file called orig-head, while interactive rebase stores it in a
> file called head.

[...]

Show 6 quoted lines

> +	if test "$type" = interactive
> +	then
> +		echo "$orig_head" > "$state_dir"/head
> +	else
> +		echo "$orig_head" > "$state_dir"/orig-head
> +	fi &&

Do we have to cater to the use-case where the user starts a rebase, downgrades at a conflict, and then continues?

If not, you could read 'orig-head' first and fall back to 'head', only writing 'orig-head' in the state saving independent of the mode. That would give us the chance of removing the redundancy at some point.

-- 
Thomas Rast
trast@{inf,student}.ethz.ch