aboutsummaryrefslogtreecommitdiffstats
path: root/refs.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2025-02-27 15:23:00 -0800
committerJunio C Hamano <gitster@pobox.com>2025-02-27 15:23:00 -0800
commit3c0f4abaf5b3e47d9426bb2bffb06d5ee47b1c95 (patch)
treeb9e0d642996257d51164d6638d77cdcc2bcfc2d0 /refs.c
parentMerge branch 'ua/os-version-capability' (diff)
parentbuiltin/refs: add '--no-reflog' flag to drop reflogs (diff)
downloadgit-3c0f4abaf5b3e47d9426bb2bffb06d5ee47b1c95.tar.gz
git-3c0f4abaf5b3e47d9426bb2bffb06d5ee47b1c95.zip
Merge branch 'kn/ref-migrate-skip-reflog'
"git refs migrate" can optionally be told not to migrate the reflog. * kn/ref-migrate-skip-reflog: builtin/refs: add '--no-reflog' flag to drop reflogs
Diffstat (limited to 'refs.c')
-rw-r--r--refs.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/refs.c b/refs.c
index e1a6a2d189..91da5325d7 100644
--- a/refs.c
+++ b/refs.c
@@ -3043,9 +3043,11 @@ int repo_migrate_ref_storage_format(struct repository *repo,
if (ret < 0)
goto done;
- ret = refs_for_each_reflog(old_refs, migrate_one_reflog, &data);
- if (ret < 0)
- goto done;
+ if (!(flags & REPO_MIGRATE_REF_STORAGE_FORMAT_SKIP_REFLOG)) {
+ ret = refs_for_each_reflog(old_refs, migrate_one_reflog, &data);
+ if (ret < 0)
+ goto done;
+ }
ret = ref_transaction_commit(transaction, errbuf);
if (ret < 0)