merge-ort: fix missing early return

[newren]

This is a patch on top of en/ort-inner-merge-error-fix which is in next.

cc: Jeff King peff@peff.net cc: Elijah Newren newren@gmail.com

[newren]

/submit

[gitgitgadget[bot]]

Submitted as pull.1758.git.1720123341342.gitgitgadget@gmail.com

To fetch this version into FETCH_HEAD:

git fetch https://github.com/gitgitgadget/git/ pr-1758/newren/fix-fix-error-cases-v1

To fetch this version to local tag pr-1758/newren/fix-fix-error-cases-v1:

git fetch --no-tags https://github.com/gitgitgadget/git/ tag pr-1758/newren/fix-fix-error-cases-v1

[gitgitgadget[bot]]

On the Git mailing list, Jeff King wrote (reply to this):

On Thu, Jul 04, 2024 at 08:02:21PM +0000, Elijah Newren via GitGitGadget wrote:

> From: Elijah Newren <newren@gmail.com>
> 
> One of the conversions in 500433edf49 ("merge-ort: convert more error()
> cases to path_msg()", 2024-06-10) accidentally lost the early return.
> Restore it.

Thanks, this looks good to me.

-Peff

[gitgitgadget[bot]]

User Jeff King <peff@peff.net> has been added to the cc: list.

[gitgitgadget[bot]]

On the Git mailing list, Junio C Hamano wrote (reply to this):

"Elijah Newren via GitGitGadget" <gitgitgadget@gmail.com> writes:

> From: Elijah Newren <newren@gmail.com>
>
> One of the conversions in 500433edf49 ("merge-ort: convert more error()
> cases to path_msg()", 2024-06-10) accidentally lost the early return.

f19b9165 (merge-ort: convert more error() cases to path_msg(),
2024-06-19) is what I have, date is different (and object name is,
too, obviously).

And funny thing is that your base-commit points at the latter.  I
briefly wondered if we can somehow automate the generation of
reference in the log message, but the base is likely to be the tip
of the topic branch that has been accepted upstream, and the commit
being fixed up can be something below, not at, that tip, so it
wouldn't be like a simple and silly "compare base-commit and the
commit we talk about in the proposed log message".

A commit-msg hook that scans for names that look like commit object names in the
message, and

 - makes sure that these commits are reachable from HEAD (the goal
   is to make sure they are reachable from the resulting commit),
   and possibly

 - makes sure that these commits are reachable from @{u} (the goal
   is to catch references of unpublished commits)

might be a possibility, but such criteria are probably highly
workflow specific, so needs to be highly customizable if we wanted
to make such a feature as a part of what we ship.

> Restore it.
>
> Signed-off-by: Elijah Newren <newren@gmail.com>
> ---

Thanks.  I saw Peff's earlier message and the change exactly matches
my expectation.  Will queue (with adjustments to the log message).

>     merge-ort: fix missing early return
>     
>     This is a patch on top of en/ort-inner-merge-error-fix which is in next.
>
> Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1758%2Fnewren%2Ffix-fix-error-cases-v1
> Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1758/newren/fix-fix-error-cases-v1
> Pull-Request: https://github.com/gitgitgadget/git/pull/1758
>
>  merge-ort.c | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/merge-ort.c b/merge-ort.c
> index 8dfe80f1009..d9ba6e3e523 100644
> --- a/merge-ort.c
> +++ b/merge-ort.c
> @@ -3618,6 +3618,7 @@ static int read_oid_strbuf(struct merge_options *opt,
>       path_msg(opt, ERROR_OBJECT_NOT_A_BLOB, 0,
>            path, NULL, NULL, NULL,
>            _("error: object %s is not a blob"), oid_to_hex(oid));
> +     return -1;
>   }
>   strbuf_attach(dst, buf, size, size + 1);
>   return 0;
>
> base-commit: f19b9165351a4058832bb43560178474c7501925

[gitgitgadget[bot]]

On the Git mailing list, Elijah Newren wrote (reply to this):

On Sat, Jul 6, 2024 at 11:30 AM Junio C Hamano <gitster@pobox.com> wrote:
>
> "Elijah Newren via GitGitGadget" <gitgitgadget@gmail.com> writes:
>
> > From: Elijah Newren <newren@gmail.com>
> >
> > One of the conversions in 500433edf49 ("merge-ort: convert more error()
> > cases to path_msg()", 2024-06-10) accidentally lost the early return.
>
> f19b9165 (merge-ort: convert more error() cases to path_msg(),
> 2024-06-19) is what I have, date is different (and object name is,
> too, obviously).

Doh, sorry, I forgot to update the reference after rebasing.

> And funny thing is that your base-commit points at the latter.  I
> briefly wondered if we can somehow automate the generation of
> reference in the log message, but the base is likely to be the tip
> of the topic branch that has been accepted upstream, and the commit
> being fixed up can be something below, not at, that tip, so it
> wouldn't be like a simple and silly "compare base-commit and the
> commit we talk about in the proposed log message".
>
> A commit-msg hook that scans for names that look like commit object names in the
> message, and
>
>  - makes sure that these commits are reachable from HEAD (the goal
>    is to make sure they are reachable from the resulting commit),
>    and possibly
>
>  - makes sure that these commits are reachable from @{u} (the goal
>    is to catch references of unpublished commits)
>
> might be a possibility, but such criteria are probably highly
> workflow specific, so needs to be highly customizable if we wanted
> to make such a feature as a part of what we ship.

Right, and a commit-hook might not catch it either.  Since my original
commit was based on the one I referenced in my commit message, the
original commit creation was fine, but I realized after creating it
that I should have created my commit on top of your applied copy, so I
needed to rebase it.  Since rebase sometimes tries to avoid invoking
`git commit` (as per sequencer.c's try_to_commit()), that'd likely
bypass the check anyway.

An alternative here is that I've thought about adding an ability for
rebase to update commit references in the commit messages it
rebases...but that may not have helped either in this particular case
since I was only rebasing the tip commit rather than the few commits
behind it as well.

> > Restore it.
> >
> > Signed-off-by: Elijah Newren <newren@gmail.com>
> > ---
>
> Thanks.  I saw Peff's earlier message and the change exactly matches
> my expectation.  Will queue (with adjustments to the log message).

Thanks.

[gitgitgadget[bot]]

User Elijah Newren <newren@gmail.com> has been added to the cc: list.

[gitgitgadget[bot]]

This patch series was integrated into seen via https://github.com/git/git/commit/22c02b0a170d99779a1906dcd708a18baf235721.

[gitgitgadget[bot]]

This branch is now known as en/ort-inner-merge-error-fix.

[gitgitgadget[bot]]

This patch series was integrated into seen via https://github.com/git/git/commit/b51502582fef2dde6e1b48cd8ef2552339962218.

[gitgitgadget[bot]]

This patch series was integrated into next via https://github.com/git/git/commit/74bdae0b3bdea4fc84b0acfdd8eb8f96f26a882f.

[gitgitgadget[bot]]

This patch series was integrated into seen via https://github.com/git/git/commit/f4b6b3605b0ebff0dd77a2414116db24d3e45d6a.

[gitgitgadget[bot]]

This patch series was integrated into seen via https://github.com/git/git/commit/775c78a6449eae42d0fbdc448d25c8455fe2f747.

[gitgitgadget[bot]]

There was a status update in the "Cooking" section about the branch en/ort-inner-merge-error-fix on the Git mailing list:

The "ort" merge backend saw one bugfix for a crash that happens
when inner merge gets killed, and assorted code clean-ups.

Will merge to 'master'.
source: <pull.1748.v2.git.1718766019.gitgitgadget@gmail.com>

[gitgitgadget[bot]]

This patch series was integrated into seen via https://github.com/git/git/commit/a356df4150eec8f98415c321225162ce6518098f.

[gitgitgadget[bot]]

There was a status update in the "Cooking" section about the branch en/ort-inner-merge-error-fix on the Git mailing list:

The "ort" merge backend saw one bugfix for a crash that happens
when inner merge gets killed, and assorted code clean-ups.

Will merge to 'master'.
source: <pull.1748.v2.git.1718766019.gitgitgadget@gmail.com>

[gitgitgadget[bot]]

This patch series was integrated into seen via https://github.com/git/git/commit/a7a4b673f7c56e7517b5b262674e9a532365772f.

[gitgitgadget[bot]]

This patch series was integrated into seen via https://github.com/git/git/commit/ffc8f1142c9ecb6f83cffe4c33c6baacf6d38026.

[gitgitgadget[bot]]

This patch series was integrated into master via https://github.com/git/git/commit/ffc8f1142c9ecb6f83cffe4c33c6baacf6d38026.

[gitgitgadget[bot]]

This patch series was integrated into next via https://github.com/git/git/commit/ffc8f1142c9ecb6f83cffe4c33c6baacf6d38026.

[gitgitgadget[bot]]

Closed via ffc8f1142c9ecb6f83cffe4c33c6baacf6d38026.