On Thu, Jul 24, 2025 at 02:10:31PM -0700, Junio C Hamano wrote:
> SZEDER Gábor <szeder.dev@xxxxxxxxx> writes:
>
> > On Tue, Jul 22, 2025 at 01:20:53PM +0200, Patrick Steinhardt wrote:
> >> diff --git a/builtin/reflog.c b/builtin/reflog.c
> >> index b00b3f9edc9..d0374295620 100644
> >> --- a/builtin/reflog.c
> >> +++ b/builtin/reflog.c
> >> @@ -3,6 +3,8 @@
> >> #include "builtin.h"
> >> #include "config.h"
> >> #include "gettext.h"
> >> +#include "hex.h"
> >> +#include "odb.h"
> >
> > This series is queued on top of v2.50.0, which doesn't have 'odb.h'
> > yet.
>
> Thanks for checking.
>
> Yet this is a topic to fix breakages that happened even before 2.50;
> "git refs migrate" started migrating reflogs in 2.48, which had one
> fix on top in 2.49. For a non-security bugfix we typically do not
> address anything older than the latest release's maintenance track,
> so a series that would fix on top of 2.50 would have been more
> appropriate.
Sure, I can rebase this on top of v2.50.1. It would then of course
require some smallish fixes when merged to `seen`. The below patch is
what is required to make it work with the v2.50 track.
Patrick
diff --git a/builtin/reflog.c b/builtin/reflog.c
index bc7e7f5e442..d3f0009cb0e 100644
--- a/builtin/reflog.c
+++ b/builtin/reflog.c
@@ -4,7 +4,7 @@
#include "config.h"
#include "gettext.h"
#include "hex.h"
-#include "odb.h"
+#include "object-store.h"
#include "revision.h"
#include "reachable.h"
#include "wildmatch.h"
@@ -426,13 +426,13 @@ static int cmd_reflog_write(int argc, const char **argv, const char *prefix,
ret = get_oid_hex_algop(argv[1], &old_oid, repo->hash_algo);
if (ret)
die(_("invalid old object ID: '%s'"), argv[1]);
- if (!is_null_oid(&old_oid) && !odb_has_object(repo->objects, &old_oid, 0))
+ if (!is_null_oid(&old_oid) && !has_object(the_repository, &old_oid, 0))
die(_("old object '%s' does not exist"), argv[1]);
ret = get_oid_hex_algop(argv[2], &new_oid, repo->hash_algo);
if (ret)
die(_("invalid new object ID: '%s'"), argv[2]);
- if (!is_null_oid(&new_oid) && !odb_has_object(repo->objects, &new_oid, 0))
+ if (!is_null_oid(&new_oid) && !has_object(the_repository, &new_oid, 0))
die(_("new object '%s' does not exist"), argv[2]);
message = argv[3];
