Re: [PATCH 24/31] rebase: extract code for writing basic state
From: Martin von Zweigbergk <hidden>
Date: 2016-06-15 22:50:20
On Tue, 4 Jan 2011, Thomas Rast wrote:
Martin von Zweigbergk wrote:quoted
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.[...]quoted
+ 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?
I'll let Junio answer that.
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.
Makes sense. Given that the answer to the previous question is a "no", I'll change this as well in the next iteration. /Martin