From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 6 Aug 2025 14:41:57 +0000 (-0700)
Subject: Merge branch 'ps/reflog-migrate-fixes' into ps/remote-rename-fix
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cf03815537033990b5691b47797968080f9ba3ab;p=thirdparty%2Fgit.git

Merge branch 'ps/reflog-migrate-fixes' into ps/remote-rename-fix

* ps/reflog-migrate-fixes:
  refs: fix invalid old object IDs when migrating reflogs
  refs: stop unsetting REF_HAVE_OLD for log-only updates
  refs/files: detect race when generating reflog entry for HEAD
  refs: fix identity for migrated reflogs
  ident: fix type of string length parameter
  builtin/reflog: implement subcommand to write new entries
  refs: export `ref_transaction_update_reflog()`
  builtin/reflog: improve grouping of subcommands
  Documentation/git-reflog: convert to use synopsis type
---

cf03815537033990b5691b47797968080f9ba3ab
diff --cc builtin/reflog.c
index 3acaf3e32c,a1b4e02204..f2bc1dc34f
--- a/builtin/reflog.c
+++ b/builtin/reflog.c
@@@ -3,6 -3,8 +3,8 @@@
  #include "builtin.h"
  #include "config.h"
  #include "gettext.h"
+ #include "hex.h"
 -#include "object-store.h"
++#include "odb.h"
  #include "revision.h"
  #include "reachable.h"
  #include "wildmatch.h"