git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "SZEDER Gábor" <szeder.dev@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Patrick Steinhardt <ps@pks.im>
Subject: Re: What's cooking in git.git (Aug 2025, #02; Mon, 4)
Date: Wed, 6 Aug 2025 22:47:18 +0200	[thread overview]
Message-ID: <aJO/VhvaH7FgluZA@szeder.dev> (raw)
In-Reply-To: <xmqqectr57ax.fsf@gitster.g>

On Mon, Aug 04, 2025 at 10:24:22AM -0700, Junio C Hamano wrote:
> * 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


  parent reply	other threads:[~2025-08-06 20:47 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-08-04 17:24 What's cooking in git.git (Aug 2025, #02; Mon, 4) Junio C Hamano
2025-08-05 13:55 ` Toon Claes
2025-08-05 18:03   ` Junio C Hamano
2025-08-06 20:47 ` SZEDER Gábor [this message]
2025-08-06 21:18   ` Junio C Hamano
2025-08-07  4:43     ` Patrick Steinhardt
2025-08-07 15:22       ` Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=aJO/VhvaH7FgluZA@szeder.dev \
    --to=szeder.dev@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=ps@pks.im \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).