Re: [PATCH 2/2] learn to pick/revert into unborn branch

From: Junio C Hamano <gitster@pobox.com>
Date: Dec 23, 2012, 04:02 UTC
Message-ID: <7vlicppg9g.fsf@alter.siamese.dyndns.org>
In-Reply-To: <1356117013-20613-2-git-send-email-martinvonz@gmail.com>

Martin von Zweigbergk <martinvonz@gmail.com> writes:

Show 8 quoted lines

> @@ -435,8 +437,9 @@ static int do_pick_commit(struct commit *commit, struct replay_opts *opts)
>  	else
>  		parent = commit->parents->item;
>  
> -	if (opts->allow_ff && parent && !hashcmp(parent->object.sha1, head))
> -		return fast_forward_to(commit->object.sha1, head);
> +	if (opts->allow_ff &&
> +	    (parent && !hashcmp(parent->object.sha1, head) || !parent && unborn))

Style (from GNU); please avoid (A && B || C) and spell the precedence between && and || explicitly, i.e.

	((A && B) || C)

> +	git rm --cached -r . &&
> +	rm -rf * &&

Not "git rm -rf ." and as two separate steps?