Re: What's cooking in git.git (Aug 2025, #02; Mon, 4)

From: SZEDER Gábor <szeder.dev@gmail.com>
Date: Aug 6, 2025, 20:47 UTC
Message-ID: <aJO/VhvaH7FgluZA@szeder.dev>
In-Reply-To: <xmqqectr57ax.fsf@gitster.g>

On Mon, Aug 04, 2025 at 10:24:22AM -0700, Junio C Hamano wrote:

Show 16 quoted lines

> * ps/remote-rename-fix (2025-07-31) 7 commits
>  - builtin/remote: only iterate through refs that are to be renamed
>  - builtin/remote: rework how remote refs get renamed
>  - builtin/remote: determine whether refs need renaming early on
>  - builtin/remote: fix sign comparison warnings
>  - refs: simplify logic when migrating reflog entries
>  - refs: pass refname when invoking reflog entry callback
>  - Merge branch 'ps/reflog-migrate-fixes' into ps/remote-rename-fix
>  (this branch uses ps/reflog-migrate-fixes.)
> 
>  "git remote rename origin upstream" failed to move origin/HEAD to
>  upstream/HEAD when origin/HEAD is unborn and performed other
>  renames extremely inefficiently, which has been corrected.
> 
>  Will merge to 'next'?
>  source: <20250731-pks-remote-rename-improvements-v2-0-dda6f083674d@pks.im>

Before merging please make sure that the topic can be built on its own. Currently all of its commits, including the merge commit the topic is based on, fail to build because:

  $ git log --oneline -1
  fc33fe7eff (HEAD) Merge branch 'ps/reflog-migrate-fixes' into ps/remote-rename-fix
  $ make
      CC builtin/reflog.o
  builtin/reflog.c:7:10: fatal error: object-store.h: No such file or directory
      7 | #include "object-store.h"
        |          ^~~~~~~~~~~~~~~~
  compilation terminated.
  make: *** [Makefile:2817: builtin/reflog.o] Error 1