From: Junio C Hamano <gitster@pobox.com>
To: Karthik Nayak <karthik.188@gmail.com>
Cc: git@vger.kernel.org, ps@pks.im,
Christian Couder <chriscool@tuxfamily.org>
Subject: Re: [PATCH v3 0/8] refs: add reflog support to `git refs migrate`
Date: Sun, 15 Dec 2024 15:54:46 -0800 [thread overview]
Message-ID: <xmqq34io8ptl.fsf@gitster.g> (raw)
In-Reply-To: <20241215-320-git-refs-migrate-reflogs-v3-0-4127fe707b98@gmail.com> (Karthik Nayak's message of "Sun, 15 Dec 2024 17:25:37 +0100")
Karthik Nayak <karthik.188@gmail.com> writes:
> Overall, this series is a bit more involved, and I would appreciate it
> if it receives a bit more scrutiny.
>
> The series is based on top of e66fd72e97 (The fourteenth batch,
> 2024-12-06) with `kn/reftable-writer-log-write-verify` merged in.
t1460.6 does not pass for me. I noticed it after I merged it to
'seen', but it fails standalone as well.
$ git log --first-parent --boundary master..kn/reflog-migration
65a841566a refs: add support for migrating reflogs
44ffb130f3 refs: allow multiple reflog entries for the same refname
6134624eaf refs: introduce the `ref_transaction_update_reflog` function
65a73fce30 refs: add `committer_info` to `ref_transaction_add_update()`
5ed33e32c7 refs: extract out refname verification in transactions
e9851924a2 refs/files: add count field to ref_lock
cdfa2c379a refs: add `index` field to `struct ref_udpate`
ee4d52c7f2 refs: include committer info in `ref_update` struct
df5d7a7ba5 Merge branch 'kn/reftable-writer-log-write-verify' into kn/reflog-migration
- 49c6b912e2 reftable/writer: ensure valid range for log's update_index
- e66fd72e97 The fourteenth batch
...
ok 5 - files: migration to same format fails
expecting success of 1460.6 'files -> reftable: migration with worktree fails':
test_when_finished "rm -rf repo" &&
git init --ref-format=$from_format repo &&
git -C repo worktree add wt &&
test_must_fail git -C repo refs migrate \
--ref-format=$to_format 2>err &&
cat >expect <<-EOF &&
error: migrating repositories with worktrees is not supported yet
EOF
test_cmp expect err
++ test_when_finished 'rm -rf repo'
++ test 0 = 0
++ test_cleanup='{ rm -rf repo
} && (exit "$eval_ret"); eval_ret=$?; :'
++ git init --ref-format=files repo
Initialized empty Git repository in /home/gitster/w/git.git/t/trash directory.t1460-refs-migrate/repo/.git/
++ git -C repo worktree add wt
No possible source branch, inferring '--orphan'
Preparing worktree (new branch 'wt')
++ test_must_fail git -C repo refs migrate --ref-format=reftable
++ case "$1" in
++ _test_ok=
++ test_must_fail_acceptable git -C repo refs migrate --ref-format=reftable
++ test git = env
++ test git = nongit
++ case "$1" in
++ return 0
++ git -C repo refs migrate --ref-format=reftable
/home/gitster/w/git.git/t/test-lib-functions.sh: line 1175: 3403665 Aborted "$@" 2>&7
++ exit_code=134
++ test 134 -eq 0
++ test_match_signal 13 134
++ test 134 = 141
++ test 134 = 269
++ return 1
++ test 134 -gt 129
++ test 134 -le 192
++ echo 'test_must_fail: died by signal 6: git -C repo refs migrate --ref-format=reftable'
test_must_fail: died by signal 6: git -C repo refs migrate --ref-format=reftable
++ return 1
error: last command exited with $?=1
not ok 6 - files -> reftable: migration with worktree fails
#
# test_when_finished "rm -rf repo" &&
# git init --ref-format=$from_format repo &&
# git -C repo worktree add wt &&
# test_must_fail git -C repo refs migrate \
# --ref-format=$to_format 2>err &&
# cat >expect <<-EOF &&
# error: migrating repositories with worktrees is not supported yet
# EOF
# test_cmp expect err
#
1..6
next prev parent reply other threads:[~2024-12-15 23:54 UTC|newest]
Thread overview: 93+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-12-09 11:07 [PATCH 0/7] refs: add reflog support to `git refs migrate` Karthik Nayak
2024-12-09 11:07 ` [PATCH 1/7] refs: include committer info in `ref_update` struct Karthik Nayak
2024-12-10 16:51 ` Christian Couder
2024-12-11 10:13 ` karthik nayak
2024-12-09 11:07 ` [PATCH 2/7] refs: add `index` field to `struct ref_udpate` Karthik Nayak
2024-12-09 11:07 ` [PATCH 3/7] refs/files: add count field to ref_lock Karthik Nayak
2024-12-10 17:22 ` Christian Couder
2024-12-11 10:18 ` karthik nayak
2024-12-11 9:05 ` Christian Couder
2024-12-11 10:26 ` karthik nayak
2024-12-09 11:07 ` [PATCH 4/7] refs: extract out refname verification in transactions Karthik Nayak
2024-12-11 9:26 ` Christian Couder
2024-12-11 10:31 ` karthik nayak
2024-12-11 14:26 ` Patrick Steinhardt
2024-12-09 11:07 ` [PATCH 5/7] refs: introduce the `ref_transaction_update_reflog` function Karthik Nayak
2024-12-11 10:10 ` Christian Couder
2024-12-11 18:06 ` karthik nayak
2024-12-11 14:26 ` Patrick Steinhardt
2024-12-11 18:09 ` karthik nayak
2024-12-09 11:07 ` [PATCH 6/7] refs: allow multiple reflog entries for the same refname Karthik Nayak
2024-12-11 10:44 ` Christian Couder
2024-12-12 14:52 ` karthik nayak
2024-12-11 14:26 ` Patrick Steinhardt
2024-12-12 14:47 ` karthik nayak
2024-12-09 11:07 ` [PATCH 7/7] refs: add support for migrating reflogs Karthik Nayak
2024-12-11 14:26 ` Patrick Steinhardt
2024-12-12 14:04 ` karthik nayak
2024-12-10 12:13 ` [PATCH 0/7] refs: add reflog support to `git refs migrate` Junio C Hamano
2024-12-10 17:42 ` karthik nayak
2024-12-10 18:03 ` karthik nayak
2024-12-13 10:36 ` [PATCH v2 0/8] " Karthik Nayak
2024-12-13 10:36 ` [PATCH v2 1/8] refs: include committer info in `ref_update` struct Karthik Nayak
2024-12-13 10:36 ` [PATCH v2 2/8] refs: add `index` field to `struct ref_udpate` Karthik Nayak
2024-12-13 10:36 ` [PATCH v2 3/8] refs/files: add count field to ref_lock Karthik Nayak
2024-12-13 10:36 ` [PATCH v2 4/8] refs: extract out refname verification in transactions Karthik Nayak
2024-12-13 10:36 ` [PATCH v2 5/8] refs: add `committer_info` to `ref_transaction_add_update()` Karthik Nayak
2024-12-13 12:24 ` Patrick Steinhardt
2024-12-13 19:43 ` karthik nayak
2024-12-19 19:31 ` Toon Claes
2024-12-20 11:31 ` karthik nayak
2024-12-13 10:36 ` [PATCH v2 6/8] refs: introduce the `ref_transaction_update_reflog` function Karthik Nayak
2024-12-13 11:44 ` Christian Couder
2024-12-13 19:49 ` karthik nayak
2024-12-13 12:24 ` Patrick Steinhardt
2024-12-13 10:36 ` [PATCH v2 7/8] refs: allow multiple reflog entries for the same refname Karthik Nayak
2024-12-13 12:24 ` Patrick Steinhardt
2024-12-13 20:02 ` karthik nayak
2024-12-13 10:36 ` [PATCH v2 8/8] refs: add support for migrating reflogs Karthik Nayak
2024-12-13 12:24 ` Patrick Steinhardt
2024-12-15 11:09 ` karthik nayak
2024-12-15 16:25 ` [PATCH v3 0/8] refs: add reflog support to `git refs migrate` Karthik Nayak
2024-12-15 16:25 ` [PATCH v3 1/8] refs: include committer info in `ref_update` struct Karthik Nayak
2024-12-15 16:25 ` [PATCH v3 2/8] refs: add `index` field to `struct ref_udpate` Karthik Nayak
2024-12-15 16:25 ` [PATCH v3 3/8] refs/files: add count field to ref_lock Karthik Nayak
2024-12-15 16:25 ` [PATCH v3 4/8] refs: extract out refname verification in transactions Karthik Nayak
2024-12-15 16:25 ` [PATCH v3 5/8] refs: add `committer_info` to `ref_transaction_add_update()` Karthik Nayak
2024-12-15 16:25 ` [PATCH v3 6/8] refs: introduce the `ref_transaction_update_reflog` function Karthik Nayak
2024-12-15 16:25 ` [PATCH v3 7/8] refs: allow multiple reflog entries for the same refname Karthik Nayak
2024-12-15 16:25 ` [PATCH v3 8/8] refs: add support for migrating reflogs Karthik Nayak
2024-12-16 7:25 ` Patrick Steinhardt
2024-12-16 15:50 ` Junio C Hamano
2024-12-16 15:59 ` karthik nayak
2024-12-15 23:54 ` Junio C Hamano [this message]
2024-12-16 14:33 ` [PATCH v3 0/8] refs: add reflog support to `git refs migrate` karthik nayak
2024-12-16 16:32 ` Junio C Hamano
2024-12-16 16:44 ` [PATCH v4 " Karthik Nayak
2024-12-16 16:44 ` [PATCH v4 1/8] refs: include committer info in `ref_update` struct Karthik Nayak
2024-12-16 16:44 ` [PATCH v4 2/8] refs: add `index` field to `struct ref_udpate` Karthik Nayak
2024-12-19 19:28 ` Toon Claes
2024-12-20 10:09 ` karthik nayak
2024-12-16 16:44 ` [PATCH v4 3/8] refs/files: add count field to ref_lock Karthik Nayak
2024-12-16 16:44 ` [PATCH v4 4/8] refs: extract out refname verification in transactions Karthik Nayak
2024-12-19 19:29 ` Toon Claes
2024-12-20 10:30 ` karthik nayak
2024-12-16 16:44 ` [PATCH v4 5/8] refs: add `committer_info` to `ref_transaction_add_update()` Karthik Nayak
2024-12-19 19:30 ` Toon Claes
2024-12-20 10:44 ` karthik nayak
2024-12-16 16:44 ` [PATCH v4 6/8] refs: introduce the `ref_transaction_update_reflog` function Karthik Nayak
2024-12-19 19:32 ` Toon Claes
2024-12-19 20:25 ` Junio C Hamano
2024-12-20 10:55 ` karthik nayak
2024-12-20 12:58 ` [PATCH] refs: mark invalid refname message for translation Karthik Nayak
2024-12-20 15:53 ` Junio C Hamano
2024-12-24 10:34 ` Toon Claes
2024-12-16 16:44 ` [PATCH v4 7/8] refs: allow multiple reflog entries for the same refname Karthik Nayak
2024-12-19 19:33 ` Toon Claes
2024-12-20 11:15 ` karthik nayak
2024-12-16 16:44 ` [PATCH v4 8/8] refs: add support for migrating reflogs Karthik Nayak
2024-12-17 6:59 ` [PATCH v4 0/8] refs: add reflog support to `git refs migrate` Patrick Steinhardt
2024-12-17 9:35 ` karthik nayak
2024-12-17 21:28 ` Junio C Hamano
2024-12-19 19:32 ` Toon Claes
2024-12-20 11:23 ` karthik nayak
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=xmqq34io8ptl.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=chriscool@tuxfamily.org \
--cc=git@vger.kernel.org \
--cc=karthik.188@gmail.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).