From: Jonathan Nieder <jrnieder@gmail.com>
Date: Thu, 28 Jul 2011 17:45:19 GMT
Subject: Re: [PATCH 10/18] revert: Save data for continuing after conflict resolution
Message-ID: <20110728174519.GB29866@elie.dc0b.debconf.org>
In-Reply-To: <1311871951-3497-11-git-send-email-artagnon@gmail.com>

Ramkumar Ramachandra wrote:

> That these two files alone are not enough to implement a "--continue"
> that remembers the command-line options specified; later patches in
> the series save them too.

Micronit: I think this sentence has an extra "That".

[...]
> +	if (!(file_exists(seq_dir) && is_directory(seq_dir))
> +		&& mkdir(seq_dir, 0777) < 0)
> +		die_errno(_("Could not create sequencer directory '%s'."), seq_dir);

Nice, thanks.

[...]
> +pristine_detach () {
> +	git checkout -f "$1^0" &&
> +	git read-tree -u --reset HEAD &&
> +	git clean -d -f -f -q -x
> +}

Nit: probably best to include the "rm -rf .git/sequencer" in this
function.  But I don't think that should hold up the patch.

Aside from typos in commit messages as mentioned before, the patches up
to here look ready.