Re: [PATCH 1/1] git-apply: Allow simultaneous --cached and --3way options

From: Junio C Hamano <gitster@pobox.com>
Date: Apr 4, 2021, 01:02 UTC
Message-ID: <xmqq1rbq276g.fsf@gitster.g>
In-Reply-To: <xmqqy2e00zaf.fsf@gitster.g>

Junio C Hamano <gitster@pobox.com> writes:

Show 23 quoted lines

> It might be OK to only allow the combination when everything auto
> resolves cleanly and fail the operation without touching either the
> index or the working tree.  Pretending there was no delete/modify
> conflicts or adding contents with unresolved conflicts as if nothing
> bad happened as stage 0 entries would never be acceptable.
>
> Perhaps
>
>  * Error out if the index does not match HEAD.
>
>  * Try applying to the contents in the index.  If there are any
>    structural conflicts, leave these paths at higher stage and do
>    not touch their contents.
>
>  * For paths without structural conflict but need content merges,
>    attempt ll-merge of the contents.  If autoresolves cleanly,
>    register the result at stage 0.  Otherwise, discard the failed
>    conflicted merge, and leave stages 1, 2 and 3 as they are.
>
>  * Exit with status 0 if and only if everything has resolved
>    cleanly.  Otherwise, exit with non-zero status.
>
> would be the minimally-acceptably-safe behaviour.

Note that, while a lot unsatisfactory than the above, the following would also be acceptable.

  * Error out if the index does not match HEAD.

  * Try applying to the contents in the index.  If there are any
    structural conflicts, abort without touching the index (or the
    working tree --- but that is best left unsaid as we all know we
    are talking about '--cached').

  * For paths without structural conflict but need content merges,
    attempt ll-merge of the contents.  If ALL SUCh PATHS autoresolve
    cleanly, register their result at stage 0.  Otherwise, abort
    without touching the index (or the working tree).

  * Exit with status 0 if and only if everything has resolved
    cleanly.  Otherwise, exit with non-zero status (and never touch
    the index or the working tree).

The version I earlier gave would give a good starting point to manually resolve the conflicts in the index and when resolved fully, it is safely recorded as the result of applying the patch on top of HEAD, because the non-final results are all in higher stages, and all the paths at stage 0 are either from the HEAD and unaffected by the merge, or the ones that cleanly resolved. The "the index must match HEAD" upfront is to ensure that. Otherwise it would make it very tempting, after spending all that time to resolve the conflicts only in the higher stages of the index, to commit the index as-is to make a child commit of HEAD and record that it is the result of applying the patch. But if the starting condition had a change unrelated to the change the patch brings in already in the index, the resulting commit would be _more_ than what the patch did to the codebase.

The simplified version would let the user proceed only when the conflicts can mechanically resolved, but it still has the "make sure what is recorded is only from the incoming patch" safety.

Of course, if the user is trying to cherry-pick parts of multiple patches and combine them to create a new single commit, the second and subsequent applycation of the patches would be thwarted by the "the index must match HEAD" rule, but it is far safer to make each step into its own snapshot commit during such a workflow to combine multiple patch pieces and then squash them together after finishing, than carrying an intermediate result only in the index and risk losing work you did in the previous step(s) to incorrect resolution in later step(s).