From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 23 Dec 2024 17:32:29 +0000 (-0800)
Subject: Merge branch 'kn/reflog-migration'
X-Git-Tag: v2.48.0-rc1~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6f8ae955bda8ad246cc1f5f7a15f1c3b1c04696a;p=thirdparty%2Fgit.git

Merge branch 'kn/reflog-migration'

"git refs migrate" learned to also migrate the reflog data across
backends.

* kn/reflog-migration:
  refs: mark invalid refname message for translation
  refs: add support for migrating reflogs
  refs: allow multiple reflog entries for the same refname
  refs: introduce the `ref_transaction_update_reflog` function
  refs: add `committer_info` to `ref_transaction_add_update()`
  refs: extract out refname verification in transactions
  refs/files: add count field to ref_lock
  refs: add `index` field to `struct ref_udpate`
  refs: include committer info in `ref_update` struct
---

6f8ae955bda8ad246cc1f5f7a15f1c3b1c04696a
diff --cc refs/files-backend.c
index 467fe347fa,8953d1c6d3..5cfb8b7ca8
--- a/refs/files-backend.c
+++ b/refs/files-backend.c
@@@ -2533,9 -2539,15 +2543,15 @@@ static int check_old_oid(struct ref_upd
  			    oid_to_hex(oid),
  			    oid_to_hex(&update->old_oid));
  
 -	return -1;
 +	return ret;
  }
  
+ struct files_transaction_backend_data {
+ 	struct ref_transaction *packed_transaction;
+ 	int packed_refs_locked;
+ 	struct strmap ref_locks;
+ };
+ 
  /*
   * Prepare for carrying out update:
   * - Lock the reference referred to by update.