Re: [PATCH 10/18] revert: Save data for continuing after conflict resolution

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]