Re: [PATCH v2 3/3] checkout: reorder option handling

From: Junio C Hamano <gitster@pobox.com>
Date: Aug 29, 2012, 18:37 UTC
Message-ID: <7v7gshwnmm.fsf@alter.siamese.dyndns.org>
In-Reply-To: <1346248524-11616-3-git-send-email-pclouds@gmail.com>

Nguyễn Thái Ngọc Duy  <pclouds@gmail.com> writes:

Show 12 quoted lines

>  I'm not entirely sure about this chunk
>
>  +	if (opts->track != BRANCH_TRACK_UNSPECIFIED) {
>  +		if (opts->new_orphan_branch)
>  +			die(_("%s cannot be used with %s"), "--orphan", "-t");
>  +		if (opts->force_detach)
>  +			die(_("%s cannot be used with %s"), "--detach", "-t");
>  +	} else
>  +		opts->track = git_branch_track;
>
>  If we don't want -t and --orphan/--detach together, then we probably should ignore
>  branch.autosetupmerge when --orphan/--detach is specified.

Yeah, I agree.

>  I did not unify new_branch, new_branch_force and new_orphan_branch.
>  They touch other parts of the code and should probably be done
>  separately.

That sounds like a very sensible decision.