Reordering commits workflow?

[alan-nf]

I sometimes want to reorder commits, e.g. I make a new commit and a new branch at the end of my stack but later decide I want it higher in the stack.

git-branchless does NOT get the branch pointers correct if I try to git rebase -i. git-branchless move DOES work though. It's very unintuitive to reach for move when I'm re-ordering commits, even when I know --insert is a thing. So my questions are:

1. Let's say I have these commits:

* (branchA) Commit 1
|
* (branchB) Commit 2
|
* (branchC) Commit 3

To transpose 2 and 3, I would do git-branchless move -x branchC -d branchA --insert which would produce:

* (branchA) Commit 1
|
* (branchC) Commit 3
|
* (branchB) Commit 2

Is that the best way of accomplishing this?
2. If it is, should re-ordering of commits be a higher-level command?
3. If we don't want a new command, should I document using git-branchless move to accomplish this workflow in a new page under Workflows in the wiki?

[arxanas]

git-branchless does NOT get the branch pointers correct if I try to git rebase -i

Presumably, it only fails if you are not currently at the last commit in the stack when you run git rebase -i? I haven't had problems if I'm at the last commit, but I have noticed git-branchless to indeed fail to permute the commits if I use git rebase -i in the middle of the stack.

1. Is that the best way of accomplishing this?

Yep, I think that's the best way at present. Alternatively, you can first jump to the last commit in the stack and use git rebase -i, as above.

2. If it is, should re-ordering of commits be a higher-level command?

Assuming I understand the problem correctly, I think the best command would be an equivalent to git rebase -i that addresses all of the commits in the stack, instead of just the ancestor commits, but currently this doesn't exist.

3. If we don't want a new command, should I document using git-branchless move to accomplish this workflow in a new page under Workflows in the wiki?

Sure, feel free to either implement the command (😉) or write up a page on the Wiki. I think the "Inserting a commit in between other commits" link in the sidebar (which links to this discussion) addresses the same workflow, but it might not be obvious if your mental model is about "reordering" commits.

[alan-nf]

Presumably, it only fails if you are not currently at the last commit in the stack when you run git rebase -i? I haven't had problems if I'm at the last commit, but I have noticed git-branchless to indeed fail to permute the commits if I use git rebase -i in the middle of the stack.

It doesn't work for me at the end of the stack either. I frequently run into an issue where I get a bunch of abandoned branches, a prompt to run git restack, and git restack doesn't work with this error:

➜ git:(alan/my-work) git restack --merge
You are trying to rewrite 50 public commits, such as: fbdd2b8 test: add e2e tests
It is generally not advised to rewrite public commits, because your
collaborators will have difficulty merging your changes.
Retry with -f/--force-rewrite to proceed anyways.

git-branchless clearly understands that the branches are pointers to rewritten commits but it just can't restack:

Software version

git-branchless 0.7.0-rc.1 (fb0265e)

Operating system

macOS 12.6 (Darwin 21.6.0)

Command-line

/Users/anorbauer/.cargo/bin/git-branchless bug-report 

Environment variables

SHELL=/bin/zsh
EDITOR=<not set>

Git version

> git version 
git version 2.37.0

Hooks

Show 7 hooks

Hook post-applypatch

#!/bin/sh
# husky

# Created by Husky v4.3.8 (https://github.com/typicode/husky#readme)
#   At: 7/26/2022, 4:27:31 PM
#   From: /Users/anorbauer/src/bala_ui/node_modules/husky (undefined)

. "$(dirname "$0")/husky.sh"
## START BRANCHLESS CONFIG

git branchless hook post-applypatch "$@"
## END BRANCHLESS CONFIG

Hook post-checkout

#!/bin/sh
## START BRANCHLESS CONFIG

git branchless hook post-checkout "$@"
## END BRANCHLESS CONFIG

Hook post-commit

#!/bin/sh
## START BRANCHLESS CONFIG

git branchless hook post-commit "$@"
## END BRANCHLESS CONFIG

Hook post-merge

#!/bin/sh
## START BRANCHLESS CONFIG

git branchless hook post-merge "$@"
## END BRANCHLESS CONFIG

Hook post-rewrite

#!/bin/sh
## START BRANCHLESS CONFIG

git branchless hook post-rewrite "$@"
## END BRANCHLESS CONFIG

Hook pre-auto-gc

#!/bin/sh
## START BRANCHLESS CONFIG

git branchless hook pre-auto-gc "$@"
## END BRANCHLESS CONFIG

Hook reference-transaction

#!/bin/sh
## START BRANCHLESS CONFIG

# Avoid canceling the reference transaction in the case that `branchless` fails
# for whatever reason.
git branchless hook reference-transaction "$@" || (
echo 'branchless: Failed to process reference transaction!'
echo 'branchless: Some events (e.g. branch updates) may have been lost.'
echo 'branchless: This is a bug. Please report it.'
)
## END BRANCHLESS CONFIG

Events

Show 5 events

Event ID: 27187, transaction ID: 18219 (message: rebase)

1. RefUpdateEvent { timestamp: 1680811763.015299, event_tx_id: EventTransactionId(18219), ref_name: ReferenceName("HEAD"), old_oid: 137e8ac0be3d0399ac104befa49e223c0978c394, new_oid: a669788c4b2bcf30801db2d982e8e9b4670e2dc2, message: None }
2. RefUpdateEvent { timestamp: 1680811763.047672, event_tx_id: EventTransactionId(18219), ref_name: ReferenceName("HEAD"), old_oid: 137e8ac0be3d0399ac104befa49e223c0978c394, new_oid: a669788c4b2bcf30801db2d982e8e9b4670e2dc2, message: None }
3. RefUpdateEvent { timestamp: 1680811839.706397, event_tx_id: EventTransactionId(18219), ref_name: ReferenceName("HEAD"), old_oid: a669788c4b2bcf30801db2d982e8e9b4670e2dc2, new_oid: 1501ce0bc224adf3765118043a16ce1bdb99c720, message: None }
4. CommitEvent { timestamp: 1680811763.0, event_tx_id: EventTransactionId(18219), commit_oid: NonZeroOid(1501ce0bc224adf3765118043a16ce1bdb99c720) }
5. RewriteEvent { timestamp: 1680811839.800145, event_tx_id: EventTransactionId(18219), old_commit_oid: a669788c4b2bcf30801db2d982e8e9b4670e2dc2, new_commit_oid: 1501ce0bc224adf3765118043a16ce1bdb99c720 }
6. RefUpdateEvent { timestamp: 1680811840.176147, event_tx_id: EventTransactionId(18219), ref_name: ReferenceName("HEAD"), old_oid: 1501ce0bc224adf3765118043a16ce1bdb99c720, new_oid: cfadb1177121a0793e03ab1243e1bf196e8268df, message: None }
7. CommitEvent { timestamp: 1680811840.0, event_tx_id: EventTransactionId(18219), commit_oid: NonZeroOid(cfadb1177121a0793e03ab1243e1bf196e8268df) }
8. RefUpdateEvent { timestamp: 1680811840.624283, event_tx_id: EventTransactionId(18219), ref_name: ReferenceName("HEAD"), old_oid: cfadb1177121a0793e03ab1243e1bf196e8268df, new_oid: 9935b5c73a7989a9a63055eec766bdae783d0312, message: None }
9. CommitEvent { timestamp: 1680811840.0, event_tx_id: EventTransactionId(18219), commit_oid: NonZeroOid(9935b5c73a7989a9a63055eec766bdae783d0312) }
10. RefUpdateEvent { timestamp: 1680811841.089053, event_tx_id: EventTransactionId(18219), ref_name: ReferenceName("HEAD"), old_oid: 9935b5c73a7989a9a63055eec766bdae783d0312, new_oid: 019ba2f69bbcd4d6b693426c0d7141997d986b1d, message: None }
11. CommitEvent { timestamp: 1680811841.0, event_tx_id: EventTransactionId(18219), commit_oid: NonZeroOid(019ba2f69bbcd4d6b693426c0d7141997d986b1d) }
12. RefUpdateEvent { timestamp: 1680811841.556658, event_tx_id: EventTransactionId(18219), ref_name: ReferenceName("HEAD"), old_oid: 019ba2f69bbcd4d6b693426c0d7141997d986b1d, new_oid: d0c7d4f059f00d9509da81298c2cd93a954f69bf, message: None }
13. CommitEvent { timestamp: 1680811841.0, event_tx_id: EventTransactionId(18219), commit_oid: NonZeroOid(d0c7d4f059f00d9509da81298c2cd93a954f69bf) }
14. RefUpdateEvent { timestamp: 1680811841.989337, event_tx_id: EventTransactionId(18219), ref_name: ReferenceName("HEAD"), old_oid: d0c7d4f059f00d9509da81298c2cd93a954f69bf, new_oid: c45a46eb36e35968fb4e5a14b4c5dbf48bb0759b, message: None }
15. CommitEvent { timestamp: 1680811841.0, event_tx_id: EventTransactionId(18219), commit_oid: NonZeroOid(c45a46eb36e35968fb4e5a14b4c5dbf48bb0759b) }
16. RefUpdateEvent { timestamp: 1680811842.460996, event_tx_id: EventTransactionId(18219), ref_name: ReferenceName("HEAD"), old_oid: c45a46eb36e35968fb4e5a14b4c5dbf48bb0759b, new_oid: 9dd5203e93c7990223ba196efe90cfbc5979372e, message: None }
17. CommitEvent { timestamp: 1680811842.0, event_tx_id: EventTransactionId(18219), commit_oid: NonZeroOid(9dd5203e93c7990223ba196efe90cfbc5979372e) }
18. RefUpdateEvent { timestamp: 1680811842.670244, event_tx_id: EventTransactionId(18219), ref_name: ReferenceName("refs/heads/redacted-ref-0"), old_oid: 137e8ac0be3d0399ac104befa49e223c0978c394, new_oid: 9dd5203e93c7990223ba196efe90cfbc5979372e, message: None }
19. RewriteEvent { timestamp: 1680811842.722976, event_tx_id: EventTransactionId(18219), old_commit_oid: a669788c4b2bcf30801db2d982e8e9b4670e2dc2, new_commit_oid: 1501ce0bc224adf3765118043a16ce1bdb99c720 }
20. RewriteEvent { timestamp: 1680811842.722976, event_tx_id: EventTransactionId(18219), old_commit_oid: d5aedd4583f1ea5c9ae06c8becaf8790a3a798b7, new_commit_oid: 1501ce0bc224adf3765118043a16ce1bdb99c720 }
21. RewriteEvent { timestamp: 1680811842.722976, event_tx_id: EventTransactionId(18219), old_commit_oid: 280ec32f8d67ee43987c6a070d3caf2a0ab80943, new_commit_oid: cfadb1177121a0793e03ab1243e1bf196e8268df }
22. RewriteEvent { timestamp: 1680811842.722976, event_tx_id: EventTransactionId(18219), old_commit_oid: 07998f8217340d0e11cef6ee3fca35f9274652e3, new_commit_oid: 9935b5c73a7989a9a63055eec766bdae783d0312 }
23. RewriteEvent { timestamp: 1680811842.722976, event_tx_id: EventTransactionId(18219), old_commit_oid: a33ecff310e11b454647cffdc170ce3b4b5c11d9, new_commit_oid: 019ba2f69bbcd4d6b693426c0d7141997d986b1d }
24. RewriteEvent { timestamp: 1680811842.722976, event_tx_id: EventTransactionId(18219), old_commit_oid: 54ca0db70596f33c673beb28b573d1dc8c26d025, new_commit_oid: d0c7d4f059f00d9509da81298c2cd93a954f69bf }
25. RewriteEvent { timestamp: 1680811842.722976, event_tx_id: EventTransactionId(18219), old_commit_oid: 7e65a94012f949cdd14edcc4449cb79788d73add, new_commit_oid: c45a46eb36e35968fb4e5a14b4c5dbf48bb0759b }
26. RewriteEvent { timestamp: 1680811842.722976, event_tx_id: EventTransactionId(18219), old_commit_oid: 137e8ac0be3d0399ac104befa49e223c0978c394, new_commit_oid: 9dd5203e93c7990223ba196efe90cfbc5979372e }

:
O 7f297f6 272d xxxxxxxxxxxxx xxxxxxx xxxx xxxxxxx xxxxx xxxxx xxxx xxxxxx
|\
: o 1cd6256 272d xxxxxxxxxxx xxxxx
: |
: o 7236cf2 266d xxxxxxx xxxxxxxxxxx
: |
: o 3edbdd0 266d (redacted-ref-1) xxx xxxxx xxxxxx xxx xx xxx xxx
:
O 9e0bfbc 241d xxxxxxxxxxxxx xxx xxxxxxxxx xx xx xxxxxx xxxxxx xxx xxxx xxxxxxx
|\
: o 18c5000 239d xxxxx xxxxxx xxxxxxx xx xxxxxxx xx
:
O 91d2fa7 232d xxxxxxxxxxxxxxxx xxx xx xxx xxxxxx xxxxxxxx xxxx
|\
: o d6cb1e8 231d (redacted-ref-2) xxx x xxxxxx xxxxxxxxxx xxxxx xx xxxxxxxx xxx xxxxxx
:
O d463560 231d xxxxxxxxxxxx xxx xxxxxx xxxxxxxx xxxx xxxxxxx xxxxxxxx xxxx xxxx
|\
: o bec200f 231d xxxx xxx xxxx xxxx xx xxxxxxxxxxxx
:
O a0e5b49 178d xxxxxx xxxxxxxxxxxxxxxx xxxxxxx xxxxxx xxxx xxxx xxxx xxxx xxxxx xxxxxx
|\
: o f763ef8 178d (redacted-ref-3) xxxxxxxxxxxxx xxx xxxxxxxxxxxxx xxxxxxx xxxxx
:
O 0605fba 147d xxxxxxxxxxxxxxx xxxxxxxx xxxx xxxx xxxxxxxx xxxx
|\
: o 77d5c0e 146d xxx x xxxxxxxxx xxxxxxx xxxx
:
O 98e46c1 141d xxxxxxxxxxxxxxxx xxxx xxxx xxxxxxx
|\
: o 5833aca 140d xxxxx xxxxx xxxxxx xxxx xxxxxxxx xxxx xxxxx xxxxxxxx xxx xxxxxx xxxxxxxxxxx
:
O 08c40fc 136d xxxxxxxxxxxx xxxxx xx xxxxxx xxxx
|\
: o 585c24e 135d xxx xxx xxxxxxxxxxxxxxxx
:
O 5471e6d 106d xxxxxxxxxxxx xxxxx xxxxxxxxx xx xxxxxx
|\
| o 449f20b 85d xxxxx xxxxxx x xxx xxxxxxx xxxxxxx
| |
| o 6ee0e93 85d xxx xxxxxxx xxx xxxxxxxxx xxxxxxx xx xxxxxx xx
| |
| o 79e4ae6 85d xxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxx xxxxx
| |
| o cd30c7a 85d xxx xxx xxxx xxxxxxxx xxxx
| |
| o 7b74b54 85d xxx xxxxxxxxxxx xxxxxxxxx xxxx xxxxxxxxxx xxxx xx xxxx
| |
| o 3695366 85d xxx xxxxxxx xxx xxxx xxxxxxxxx xx xxxxxx xxx xxx xxxxxxx xx xxxx
| |
| o 04363af 85d xxxxxxxxx xxxxxxx xx xxxxxxxxxx xxx xxxxxxxxxxxx xxxxx
| |
| o ce9bc7b 85d (redacted-ref-4) xxx x xxxxx xxx xxxxxx xxx xx xxxxxxxx xxxx
| |
| o dbc782d 85d (redacted-ref-5) xxx x xxx xxx xxxx xxx xxxxxxx
|
O 0c509a5 85d xxx xxx xxxxxxxxxxxxxxxx
|\
| o 35011bb 85d (redacted-ref-6) xxx x xxxxxx xxxx xx xxxxxx
|\
: o 68dd7db 85d (redacted-ref-7) xxxxxxxxxxxxxx xxxxxxx xxxx xxxx xxxxxxx xxxxx xxxxxxx
:
O 2e69688 44d xxxxxxxxxxxx xxx xxxx xxxxxxx xx xxxxxxx xxxxxx
|\
| o 1c01be2 35d (redacted-ref-8) xxx x xxxx xxxxxxxxxx xxxx xxxxx
|\
: o dcbfe3c 31d xxxxxxxxxxxxxx xxxx xxx xxxxxxxxxxxxxxxxx
:
O 8fe759d 29d xxxxxxxxx xxxxxxxxx x xxxxxxx xxxxxx xxxx xxxxxxx xxxxx xxxx xxxxx xxxx xxxxxxx xxxxxxx xxxx xxxxxxx xxxxx xxxxx xxxxxxx
|\
| o 9b5c294 29d xxxxxxxxxxxxx xxx xxxxxxx xxxxxxxxx
|\
: o a3b5fc0 29d xxxxxxxxxxxxx xxx xxxxxxx xxxxxxxxx
:
O b766c8e 29d xxxxxxxxxxxx xxx xxxxx xxxxxxxxx xxx xxxxxx xxxxxx
|\
| o 2a28986 29d (redacted-ref-9) xxxxx xxxxxxxxxxxxx xxx xxxxxxx
|\
| o 9e1d619 29d xxxxx xxxxxxxxxxxxx xxx xxxxxxx
|\
| o 7a884e1 28d xxxxxx xxxxxxxxxxxxx xxxx xxxxx xxxxxx xxxxxx xxxx xxxxxxx xx xxx xxxxxxx
|\
: o 3948123 28d xxxxxx xxxxxxxxxxxxx xxxx xxxxx xxxxxx xxxxxx xxxx xxxxxxx xx xxx xxxxxxx
:
O fbdd2b8 3d (main) xxxxxxxxxxxxx xxx xxx xxxxx
|\
| o 2e1cee1 1d (redacted-ref-10) xxxxxxxxxxxxxx xxxxxxx xx xxxxxx xx xxxxxxxxxxxxxxxxxxxxxxxxxxxx
|\
| o 44dea43 1d xxxxxxxxxxxx xxx xxxxxxxxxxx xxxx xxxxxxx
|\
| o 89f5295 1d (redacted-ref-11) xxxxx xxxxxxxxxxxx xxxx xxxx xxxx xxxxx xxxxxxxxx xxx xxx xxxxxxx
|\
| o aadb365 1d xxxx xxxxxx xxxxxxxxxx
|\
| o d889776 1d (redacted-ref-12) xxxxxxxxxxxx xxxx xxxxxx xxxx xxxxxxxxx xxxxx xxxxx xx xxx xxxxxx xxxx
|\
| o e6244c8 1d (redacted-ref-13) xxx x xxx xxx xxxx xxx xxxx xxxx
|\
| o 645ca51 1d (redacted-ref-14) xxxxxxxxxxxxx xxxx xxx xxxxx xxxxx xxxxxxxx xxx
|\
| o cb1eb9d 1d xxxx xxxxx xxxx xxxxxxxxxxxx x xxxx xxxxx
|
o 4098bbc 1d (redacted-ref-15) xxx xxx xxxxxxx xxx xxxxxx xxxxxxxxx xxxxxxx
|\
| x a669788 1d (rewritten as 1501ce0b) xxx xxxx xxxxxx xx xxxxxxx xxxxxxx xxxxxxxxxxx
| |
| x d5aedd4 6m (rewritten as 1501ce0b) (redacted-ref-16) xxxx xxxxxxxxxxxxxxxxxxxxxxxx xx xx
| |
| x 280ec32 6m (rewritten as cfadb117) (redacted-ref-17) xxxxxxxxxxxxx xxxxx xx xxx xxxxxxx xxxxx
| |
| x 07998f8 6m (rewritten as 9935b5c7) (redacted-ref-18) xxxxxxxxxxxxx xxxxxx xxx xxxx xxxxxxxx
| |
| x a33ecff 6m (rewritten as 019ba2f6) (redacted-ref-19) xxxxxxxxxxxx xxx xxxxxx xxxxxxxxxxxx xx xxxxxxx xxxx
| |
| x 54ca0db 5m (rewritten as d0c7d4f0) (redacted-ref-20) xxxxxxxxxxxxx xxx xxx xxxx xxx xxxxxx xxxxxxxx xxxx
| |
| x 7e65a94 5m (rewritten as c45a46eb) (redacted-ref-21) xxxx xxxx xxxxx xx xxxxx
|
o 1501ce0 4m xxx xxxx xxxxxx xx xxxxxxx xxxxxxx xxxxxxxxxxx
|
o cfadb11 3m xxxxxxxxxxxxx xxxxx xx xxx xxxxxxx xxxxx
|
o 9935b5c 3m xxxxxxxxxxxxx xxxxxx xxx xxxx xxxxxxxx
|
o 019ba2f 3m xxxxxxxxxxxx xxx xxxxxx xxxxxxxxxxxx xx xxxxxxx xxxx
|
o d0c7d4f 3m xxxxxxxxxxxxx xxx xxx xxxx xxx xxxxxx xxxxxxxx xxxx
|
o c45a46e 3m xxxx xxxx xxxxx xx xxxxx
|
@ 9dd5203 3m (redacted-ref-0) xxxx xxxx xxxxxxxxxxxx

Event ID: 27185, transaction ID: 18217 (message: sw)

1. WorkingCopySnapshot { timestamp: 1680811744.104714, event_tx_id: EventTransactionId(18217), head_oid: d5aedd4583f1ea5c9ae06c8becaf8790a3a798b7, commit_oid: NonZeroOid(3896fcb58c8536f31fbb40e0027b08f9e3c1ac34), ref_name: Some(ReferenceName("refs/heads/redacted-ref-16")) }
2. RefUpdateEvent { timestamp: 1680811744.192506, event_tx_id: EventTransactionId(18217), ref_name: ReferenceName("HEAD"), old_oid: d5aedd4583f1ea5c9ae06c8becaf8790a3a798b7, new_oid: 137e8ac0be3d0399ac104befa49e223c0978c394, message: None }

:
O 7f297f6 272d xxxxxxxxxxxxx xxxxxxx xxxx xxxxxxx xxxxx xxxxx xxxx xxxxxx
|\
: o 1cd6256 272d xxxxxxxxxxx xxxxx
: |
: o 7236cf2 266d xxxxxxx xxxxxxxxxxx
: |
: o 3edbdd0 266d (redacted-ref-1) xxx xxxxx xxxxxx xxx xx xxx xxx
:
O 9e0bfbc 241d xxxxxxxxxxxxx xxx xxxxxxxxx xx xx xxxxxx xxxxxx xxx xxxx xxxxxxx
|\
: o 18c5000 239d xxxxx xxxxxx xxxxxxx xx xxxxxxx xx
:
O 91d2fa7 232d xxxxxxxxxxxxxxxx xxx xx xxx xxxxxx xxxxxxxx xxxx
|\
: o d6cb1e8 231d (redacted-ref-2) xxx x xxxxxx xxxxxxxxxx xxxxx xx xxxxxxxx xxx xxxxxx
:
O d463560 231d xxxxxxxxxxxx xxx xxxxxx xxxxxxxx xxxx xxxxxxx xxxxxxxx xxxx xxxx
|\
: o bec200f 231d xxxx xxx xxxx xxxx xx xxxxxxxxxxxx
:
O a0e5b49 178d xxxxxx xxxxxxxxxxxxxxxx xxxxxxx xxxxxx xxxx xxxx xxxx xxxx xxxxx xxxxxx
|\
: o f763ef8 178d (redacted-ref-3) xxxxxxxxxxxxx xxx xxxxxxxxxxxxx xxxxxxx xxxxx
:
O 0605fba 147d xxxxxxxxxxxxxxx xxxxxxxx xxxx xxxx xxxxxxxx xxxx
|\
: o 77d5c0e 146d xxx x xxxxxxxxx xxxxxxx xxxx
:
O 98e46c1 141d xxxxxxxxxxxxxxxx xxxx xxxx xxxxxxx
|\
: o 5833aca 140d xxxxx xxxxx xxxxxx xxxx xxxxxxxx xxxx xxxxx xxxxxxxx xxx xxxxxx xxxxxxxxxxx
:
O 08c40fc 136d xxxxxxxxxxxx xxxxx xx xxxxxx xxxx
|\
: o 585c24e 135d xxx xxx xxxxxxxxxxxxxxxx
:
O 5471e6d 106d xxxxxxxxxxxx xxxxx xxxxxxxxx xx xxxxxx
|\
| o 449f20b 85d xxxxx xxxxxx x xxx xxxxxxx xxxxxxx
| |
| o 6ee0e93 85d xxx xxxxxxx xxx xxxxxxxxx xxxxxxx xx xxxxxx xx
| |
| o 79e4ae6 85d xxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxx xxxxx
| |
| o cd30c7a 85d xxx xxx xxxx xxxxxxxx xxxx
| |
| o 7b74b54 85d xxx xxxxxxxxxxx xxxxxxxxx xxxx xxxxxxxxxx xxxx xx xxxx
| |
| o 3695366 85d xxx xxxxxxx xxx xxxx xxxxxxxxx xx xxxxxx xxx xxx xxxxxxx xx xxxx
| |
| o 04363af 85d xxxxxxxxx xxxxxxx xx xxxxxxxxxx xxx xxxxxxxxxxxx xxxxx
| |
| o ce9bc7b 85d (redacted-ref-4) xxx x xxxxx xxx xxxxxx xxx xx xxxxxxxx xxxx
| |
| o dbc782d 85d (redacted-ref-5) xxx x xxx xxx xxxx xxx xxxxxxx
|
O 0c509a5 85d xxx xxx xxxxxxxxxxxxxxxx
|\
| o 35011bb 85d (redacted-ref-6) xxx x xxxxxx xxxx xx xxxxxx
|\
: o 68dd7db 85d (redacted-ref-7) xxxxxxxxxxxxxx xxxxxxx xxxx xxxx xxxxxxx xxxxx xxxxxxx
:
O 2e69688 44d xxxxxxxxxxxx xxx xxxx xxxxxxx xx xxxxxxx xxxxxx
|\
| o 1c01be2 35d (redacted-ref-8) xxx x xxxx xxxxxxxxxx xxxx xxxxx
|\
: o dcbfe3c 31d xxxxxxxxxxxxxx xxxx xxx xxxxxxxxxxxxxxxxx
:
O 8fe759d 29d xxxxxxxxx xxxxxxxxx x xxxxxxx xxxxxx xxxx xxxxxxx xxxxx xxxx xxxxx xxxx xxxxxxx xxxxxxx xxxx xxxxxxx xxxxx xxxxx xxxxxxx
|\
| o 9b5c294 29d xxxxxxxxxxxxx xxx xxxxxxx xxxxxxxxx
|\
: o a3b5fc0 29d xxxxxxxxxxxxx xxx xxxxxxx xxxxxxxxx
:
O b766c8e 29d xxxxxxxxxxxx xxx xxxxx xxxxxxxxx xxx xxxxxx xxxxxx
|\
| o 2a28986 29d (redacted-ref-9) xxxxx xxxxxxxxxxxxx xxx xxxxxxx
|\
| o 9e1d619 29d xxxxx xxxxxxxxxxxxx xxx xxxxxxx
|\
| o 7a884e1 28d xxxxxx xxxxxxxxxxxxx xxxx xxxxx xxxxxx xxxxxx xxxx xxxxxxx xx xxx xxxxxxx
|\
: o 3948123 28d xxxxxx xxxxxxxxxxxxx xxxx xxxxx xxxxxx xxxxxx xxxx xxxxxxx xx xxx xxxxxxx
:
O fbdd2b8 3d (main) xxxxxxxxxxxxx xxx xxx xxxxx
|\
| o 2e1cee1 1d (redacted-ref-10) xxxxxxxxxxxxxx xxxxxxx xx xxxxxx xx xxxxxxxxxxxxxxxxxxxxxxxxxxxx
|\
| o 44dea43 1d xxxxxxxxxxxx xxx xxxxxxxxxxx xxxx xxxxxxx
|\
| o 89f5295 1d (redacted-ref-11) xxxxx xxxxxxxxxxxx xxxx xxxx xxxx xxxxx xxxxxxxxx xxx xxx xxxxxxx
|\
| o aadb365 1d xxxx xxxxxx xxxxxxxxxx
|\
| o d889776 1d (redacted-ref-12) xxxxxxxxxxxx xxxx xxxxxx xxxx xxxxxxxxx xxxxx xxxxx xx xxx xxxxxx xxxx
|\
| o e6244c8 1d (redacted-ref-13) xxx x xxx xxx xxxx xxx xxxx xxxx
|\
| o 645ca51 1d (redacted-ref-14) xxxxxxxxxxxxx xxxx xxx xxxxx xxxxx xxxxxxxx xxx
|\
| o cb1eb9d 1d xxxx xxxxx xxxx xxxxxxxxxxxx x xxxx xxxxx
|
o 4098bbc 1d (redacted-ref-15) xxx xxx xxxxxxx xxx xxxxxx xxxxxxxxx xxxxxxx
|\
| x a669788 1d xxx xxxx xxxxxx xx xxxxxxx xxxxxxx xxxxxxxxxxx
| |
| x d5aedd4 6m (redacted-ref-16) xxxx xxxxxxxxxxxxxxxxxxxxxxxx xx xx
| |
| x 280ec32 6m (redacted-ref-17) xxxxxxxxxxxxx xxxxx xx xxx xxxxxxx xxxxx
| |
| x 07998f8 6m (redacted-ref-18) xxxxxxxxxxxxx xxxxxx xxx xxxx xxxxxxxx
| |
| x a33ecff 6m (redacted-ref-19) xxxxxxxxxxxx xxx xxxxxx xxxxxxxxxxxx xx xxxxxxx xxxx
| |
| x 54ca0db 5m (redacted-ref-20) xxxxxxxxxxxxx xxx xxx xxxx xxx xxxxxx xxxxxxxx xxxx
| |
| x 7e65a94 5m (redacted-ref-21) xxxx xxxx xxxxx xx xxxxx
|
o 1501ce0 4m xxx xxxx xxxxxx xx xxxxxxx xxxxxxx xxxxxxxxxxx
|
o cfadb11 3m xxxxxxxxxxxxx xxxxx xx xxx xxxxxxx xxxxx
|
o 9935b5c 3m xxxxxxxxxxxxx xxxxxx xxx xxxx xxxxxxxx
|
o 019ba2f 3m xxxxxxxxxxxx xxx xxxxxx xxxxxxxxxxxx xx xxxxxxx xxxx
|
o d0c7d4f 3m xxxxxxxxxxxxx xxx xxx xxxx xxx xxxxxx xxxxxxxx xxxx
|
o c45a46e 3m xxxx xxxx xxxxx xx xxxxx
|
@ 9dd5203 3m (redacted-ref-0) xxxx xxxx xxxxxxxxxxxx

Event ID: 27165, transaction ID: 18215 (message: rebase)

1. RefUpdateEvent { timestamp: 1680811715.829084, event_tx_id: EventTransactionId(18215), ref_name: ReferenceName("HEAD"), old_oid: a33ecff310e11b454647cffdc170ce3b4b5c11d9, new_oid: 54ca0db70596f33c673beb28b573d1dc8c26d025, message: None }
2. CommitEvent { timestamp: 1680811712.0, event_tx_id: EventTransactionId(18215), commit_oid: NonZeroOid(54ca0db70596f33c673beb28b573d1dc8c26d025) }
3. RefUpdateEvent { timestamp: 1680811716.186603, event_tx_id: EventTransactionId(18215), ref_name: ReferenceName("HEAD"), old_oid: 54ca0db70596f33c673beb28b573d1dc8c26d025, new_oid: 7e65a94012f949cdd14edcc4449cb79788d73add, message: None }
4. CommitEvent { timestamp: 1680811716.0, event_tx_id: EventTransactionId(18215), commit_oid: NonZeroOid(7e65a94012f949cdd14edcc4449cb79788d73add) }
5. RefUpdateEvent { timestamp: 1680811716.890051, event_tx_id: EventTransactionId(18215), ref_name: ReferenceName("HEAD"), old_oid: 7e65a94012f949cdd14edcc4449cb79788d73add, new_oid: 137e8ac0be3d0399ac104befa49e223c0978c394, message: None }
6. CommitEvent { timestamp: 1680811716.0, event_tx_id: EventTransactionId(18215), commit_oid: NonZeroOid(137e8ac0be3d0399ac104befa49e223c0978c394) }
7. RewriteEvent { timestamp: 1680811717.292323, event_tx_id: EventTransactionId(18215), old_commit_oid: 30b2bfc1d1976c614d6db40a4c2769050802739c, new_commit_oid: 280ec32f8d67ee43987c6a070d3caf2a0ab80943 }
8. RewriteEvent { timestamp: 1680811717.292323, event_tx_id: EventTransactionId(18215), old_commit_oid: 1fc6f1fa07431c64ea5203c8c6735843be85fe48, new_commit_oid: 07998f8217340d0e11cef6ee3fca35f9274652e3 }
9. RewriteEvent { timestamp: 1680811717.292323, event_tx_id: EventTransactionId(18215), old_commit_oid: f018727d9086002c27909290b7ac28596c48be16, new_commit_oid: a33ecff310e11b454647cffdc170ce3b4b5c11d9 }
10. RewriteEvent { timestamp: 1680811717.292323, event_tx_id: EventTransactionId(18215), old_commit_oid: ba1018f8de416d405eac628f31492f7cd622b71e, new_commit_oid: 54ca0db70596f33c673beb28b573d1dc8c26d025 }
11. RewriteEvent { timestamp: 1680811717.292323, event_tx_id: EventTransactionId(18215), old_commit_oid: 0a9244f08193ebfc70030f55e037f2fdb993b1e4, new_commit_oid: 7e65a94012f949cdd14edcc4449cb79788d73add }
12. RewriteEvent { timestamp: 1680811717.292323, event_tx_id: EventTransactionId(18215), old_commit_oid: 83cdc1106240609a2d937024c2551b7ab6edefa5, new_commit_oid: 137e8ac0be3d0399ac104befa49e223c0978c394 }
13. RefUpdateEvent { timestamp: 1680811717.356577, event_tx_id: EventTransactionId(18215), ref_name: ReferenceName("refs/heads/redacted-ref-19"), old_oid: f018727d9086002c27909290b7ac28596c48be16, new_oid: a33ecff310e11b454647cffdc170ce3b4b5c11d9, message: None }
14. RefUpdateEvent { timestamp: 1680811717.356577, event_tx_id: EventTransactionId(18215), ref_name: ReferenceName("refs/heads/redacted-ref-17"), old_oid: 30b2bfc1d1976c614d6db40a4c2769050802739c, new_oid: 280ec32f8d67ee43987c6a070d3caf2a0ab80943, message: None }
15. RefUpdateEvent { timestamp: 1680811717.356577, event_tx_id: EventTransactionId(18215), ref_name: ReferenceName("refs/heads/redacted-ref-21"), old_oid: 0a9244f08193ebfc70030f55e037f2fdb993b1e4, new_oid: 7e65a94012f949cdd14edcc4449cb79788d73add, message: None }
16. RefUpdateEvent { timestamp: 1680811717.356577, event_tx_id: EventTransactionId(18215), ref_name: ReferenceName("refs/heads/redacted-ref-20"), old_oid: ba1018f8de416d405eac628f31492f7cd622b71e, new_oid: 54ca0db70596f33c673beb28b573d1dc8c26d025, message: None }
17. RefUpdateEvent { timestamp: 1680811717.356577, event_tx_id: EventTransactionId(18215), ref_name: ReferenceName("refs/heads/redacted-ref-0"), old_oid: 83cdc1106240609a2d937024c2551b7ab6edefa5, new_oid: 137e8ac0be3d0399ac104befa49e223c0978c394, message: None }
18. RefUpdateEvent { timestamp: 1680811717.356577, event_tx_id: EventTransactionId(18215), ref_name: ReferenceName("refs/heads/redacted-ref-18"), old_oid: 1fc6f1fa07431c64ea5203c8c6735843be85fe48, new_oid: 07998f8217340d0e11cef6ee3fca35f9274652e3, message: None }
19. WorkingCopySnapshot { timestamp: 1680811717.484197, event_tx_id: EventTransactionId(18215), head_oid: 137e8ac0be3d0399ac104befa49e223c0978c394, commit_oid: NonZeroOid(707a7ed6bc048bb895a9be1b2a9b8cb7a53fe407), ref_name: None }
20. RefUpdateEvent { timestamp: 1680811717.846821, event_tx_id: EventTransactionId(18215), ref_name: ReferenceName("HEAD"), old_oid: 137e8ac0be3d0399ac104befa49e223c0978c394, new_oid: d5aedd4583f1ea5c9ae06c8becaf8790a3a798b7, message: None }

:
O 7f297f6 272d xxxxxxxxxxxxx xxxxxxx xxxx xxxxxxx xxxxx xxxxx xxxx xxxxxx
|\
: o 1cd6256 272d xxxxxxxxxxx xxxxx
: |
: o 7236cf2 266d xxxxxxx xxxxxxxxxxx
: |
: o 3edbdd0 266d (redacted-ref-1) xxx xxxxx xxxxxx xxx xx xxx xxx
:
O 9e0bfbc 241d xxxxxxxxxxxxx xxx xxxxxxxxx xx xx xxxxxx xxxxxx xxx xxxx xxxxxxx
|\
: o 18c5000 239d xxxxx xxxxxx xxxxxxx xx xxxxxxx xx
:
O 91d2fa7 232d xxxxxxxxxxxxxxxx xxx xx xxx xxxxxx xxxxxxxx xxxx
|\
: o d6cb1e8 231d (redacted-ref-2) xxx x xxxxxx xxxxxxxxxx xxxxx xx xxxxxxxx xxx xxxxxx
:
O d463560 231d xxxxxxxxxxxx xxx xxxxxx xxxxxxxx xxxx xxxxxxx xxxxxxxx xxxx xxxx
|\
: o bec200f 231d xxxx xxx xxxx xxxx xx xxxxxxxxxxxx
:
O a0e5b49 178d xxxxxx xxxxxxxxxxxxxxxx xxxxxxx xxxxxx xxxx xxxx xxxx xxxx xxxxx xxxxxx
|\
: o f763ef8 178d (redacted-ref-3) xxxxxxxxxxxxx xxx xxxxxxxxxxxxx xxxxxxx xxxxx
:
O 0605fba 147d xxxxxxxxxxxxxxx xxxxxxxx xxxx xxxx xxxxxxxx xxxx
|\
: o 77d5c0e 146d xxx x xxxxxxxxx xxxxxxx xxxx
:
O 98e46c1 141d xxxxxxxxxxxxxxxx xxxx xxxx xxxxxxx
|\
: o 5833aca 140d xxxxx xxxxx xxxxxx xxxx xxxxxxxx xxxx xxxxx xxxxxxxx xxx xxxxxx xxxxxxxxxxx
:
O 08c40fc 136d xxxxxxxxxxxx xxxxx xx xxxxxx xxxx
|\
: o 585c24e 135d xxx xxx xxxxxxxxxxxxxxxx
:
O 5471e6d 106d xxxxxxxxxxxx xxxxx xxxxxxxxx xx xxxxxx
|\
| o 449f20b 85d xxxxx xxxxxx x xxx xxxxxxx xxxxxxx
| |
| o 6ee0e93 85d xxx xxxxxxx xxx xxxxxxxxx xxxxxxx xx xxxxxx xx
| |
| o 79e4ae6 85d xxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxx xxxxx
| |
| o cd30c7a 85d xxx xxx xxxx xxxxxxxx xxxx
| |
| o 7b74b54 85d xxx xxxxxxxxxxx xxxxxxxxx xxxx xxxxxxxxxx xxxx xx xxxx
| |
| o 3695366 85d xxx xxxxxxx xxx xxxx xxxxxxxxx xx xxxxxx xxx xxx xxxxxxx xx xxxx
| |
| o 04363af 85d xxxxxxxxx xxxxxxx xx xxxxxxxxxx xxx xxxxxxxxxxxx xxxxx
| |
| o ce9bc7b 85d (redacted-ref-4) xxx x xxxxx xxx xxxxxx xxx xx xxxxxxxx xxxx
| |
| o dbc782d 85d (redacted-ref-5) xxx x xxx xxx xxxx xxx xxxxxxx
|
O 0c509a5 85d xxx xxx xxxxxxxxxxxxxxxx
|\
| o 35011bb 85d (redacted-ref-6) xxx x xxxxxx xxxx xx xxxxxx
|\
: o 68dd7db 85d (redacted-ref-7) xxxxxxxxxxxxxx xxxxxxx xxxx xxxx xxxxxxx xxxxx xxxxxxx
:
O 2e69688 44d xxxxxxxxxxxx xxx xxxx xxxxxxx xx xxxxxxx xxxxxx
|\
| o 1c01be2 35d (redacted-ref-8) xxx x xxxx xxxxxxxxxx xxxx xxxxx
|\
: o dcbfe3c 31d xxxxxxxxxxxxxx xxxx xxx xxxxxxxxxxxxxxxxx
:
O 8fe759d 29d xxxxxxxxx xxxxxxxxx x xxxxxxx xxxxxx xxxx xxxxxxx xxxxx xxxx xxxxx xxxx xxxxxxx xxxxxxx xxxx xxxxxxx xxxxx xxxxx xxxxxxx
|\
| o 9b5c294 29d xxxxxxxxxxxxx xxx xxxxxxx xxxxxxxxx
|\
: o a3b5fc0 29d xxxxxxxxxxxxx xxx xxxxxxx xxxxxxxxx
:
O b766c8e 29d xxxxxxxxxxxx xxx xxxxx xxxxxxxxx xxx xxxxxx xxxxxx
|\
| o 2a28986 29d (redacted-ref-9) xxxxx xxxxxxxxxxxxx xxx xxxxxxx
|\
| o 9e1d619 29d xxxxx xxxxxxxxxxxxx xxx xxxxxxx
|\
| o 7a884e1 28d xxxxxx xxxxxxxxxxxxx xxxx xxxxx xxxxxx xxxxxx xxxx xxxxxxx xx xxx xxxxxxx
|\
: o 3948123 28d xxxxxx xxxxxxxxxxxxx xxxx xxxxx xxxxxx xxxxxx xxxx xxxxxxx xx xxx xxxxxxx
:
O fbdd2b8 3d (main) xxxxxxxxxxxxx xxx xxx xxxxx
|\
| o 2e1cee1 1d (redacted-ref-10) xxxxxxxxxxxxxx xxxxxxx xx xxxxxx xx xxxxxxxxxxxxxxxxxxxxxxxxxxxx
|\
| o 44dea43 1d xxxxxxxxxxxx xxx xxxxxxxxxxx xxxx xxxxxxx
|\
| o 89f5295 1d (redacted-ref-11) xxxxx xxxxxxxxxxxx xxxx xxxx xxxx xxxxx xxxxxxxxx xxx xxx xxxxxxx
|\
| o aadb365 1d xxxx xxxxxx xxxxxxxxxx
|\
| o d889776 1d (redacted-ref-12) xxxxxxxxxxxx xxxx xxxxxx xxxx xxxxxxxxx xxxxx xxxxx xx xxx xxxxxx xxxx
|\
| o e6244c8 1d (redacted-ref-13) xxx x xxx xxx xxxx xxx xxxx xxxx
|\
| o 645ca51 1d (redacted-ref-14) xxxxxxxxxxxxx xxxx xxx xxxxx xxxxx xxxxxxxx xxx
|\
| o cb1eb9d 1d xxxx xxxxx xxxx xxxxxxxxxxxx x xxxx xxxxx
|
o 4098bbc 1d (redacted-ref-15) xxx xxx xxxxxxx xxx xxxxxx xxxxxxxxx xxxxxxx
|\
| x a669788 1d xxx xxxx xxxxxx xx xxxxxxx xxxxxxx xxxxxxxxxxx
| |
| x d5aedd4 6m (redacted-ref-16) xxxx xxxxxxxxxxxxxxxxxxxxxxxx xx xx
| |
| x 280ec32 6m (redacted-ref-17) xxxxxxxxxxxxx xxxxx xx xxx xxxxxxx xxxxx
| |
| x 07998f8 6m (redacted-ref-18) xxxxxxxxxxxxx xxxxxx xxx xxxx xxxxxxxx
| |
| x a33ecff 6m (redacted-ref-19) xxxxxxxxxxxx xxx xxxxxx xxxxxxxxxxxx xx xxxxxxx xxxx
| |
| x 54ca0db 5m (redacted-ref-20) xxxxxxxxxxxxx xxx xxx xxxx xxx xxxxxx xxxxxxxx xxxx
| |
| x 7e65a94 5m (redacted-ref-21) xxxx xxxx xxxxx xx xxxxx
|
o 1501ce0 4m xxx xxxx xxxxxx xx xxxxxxx xxxxxxx xxxxxxxxxxx
|
o cfadb11 3m xxxxxxxxxxxxx xxxxx xx xxx xxxxxxx xxxxx
|
o 9935b5c 3m xxxxxxxxxxxxx xxxxxx xxx xxxx xxxxxxxx
|
o 019ba2f 3m xxxxxxxxxxxx xxx xxxxxx xxxxxxxxxxxx xx xxxxxxx xxxx
|
o d0c7d4f 3m xxxxxxxxxxxxx xxx xxx xxxx xxx xxxxxx xxxxxxxx xxxx
|
o c45a46e 3m xxxx xxxx xxxxx xx xxxxx
|
@ 9dd5203 3m (redacted-ref-0) xxxx xxxx xxxxxxxxxxxx

Event ID: 27150, transaction ID: 18213 (message: amend)

1. WorkingCopySnapshot { timestamp: 1680811687.410819, event_tx_id: EventTransactionId(18213), head_oid: 956339f26b4b78f6a9b01887ca172cad7aa26607, commit_oid: NonZeroOid(213a6713158f361b95c472115533a5cce20efefb), ref_name: Some(ReferenceName("refs/heads/redacted-ref-16")) }
2. RewriteEvent { timestamp: 1680811687.410819, event_tx_id: EventTransactionId(18213), old_commit_oid: 956339f26b4b78f6a9b01887ca172cad7aa26607, new_commit_oid: d5aedd4583f1ea5c9ae06c8becaf8790a3a798b7 }
3. WorkingCopySnapshot { timestamp: 1680811687.805777, event_tx_id: EventTransactionId(18213), head_oid: 956339f26b4b78f6a9b01887ca172cad7aa26607, commit_oid: NonZeroOid(213a6713158f361b95c472115533a5cce20efefb), ref_name: Some(ReferenceName("refs/heads/redacted-ref-16")) }
4. RefUpdateEvent { timestamp: 1680811688.007841, event_tx_id: EventTransactionId(18213), ref_name: ReferenceName("HEAD"), old_oid: 956339f26b4b78f6a9b01887ca172cad7aa26607, new_oid: d5aedd4583f1ea5c9ae06c8becaf8790a3a798b7, message: None }
5. RefUpdateEvent { timestamp: 1680811688.007841, event_tx_id: EventTransactionId(18213), ref_name: ReferenceName("refs/heads/redacted-ref-16"), old_oid: 956339f26b4b78f6a9b01887ca172cad7aa26607, new_oid: d5aedd4583f1ea5c9ae06c8becaf8790a3a798b7, message: None }
6. RefUpdateEvent { timestamp: 1680811688.080464, event_tx_id: EventTransactionId(18213), ref_name: ReferenceName("refs/heads/redacted-ref-16"), old_oid: 0000000000000000000000000000000000000000, new_oid: d5aedd4583f1ea5c9ae06c8becaf8790a3a798b7, message: None }
7. RefUpdateEvent { timestamp: 1680811688.080464, event_tx_id: EventTransactionId(18213), ref_name: ReferenceName("HEAD"), old_oid: 0000000000000000000000000000000000000000, new_oid: d5aedd4583f1ea5c9ae06c8becaf8790a3a798b7, message: None }
8. RefUpdateEvent { timestamp: 1680811688.121201, event_tx_id: EventTransactionId(18213), ref_name: ReferenceName("HEAD"), old_oid: d5aedd4583f1ea5c9ae06c8becaf8790a3a798b7, new_oid: d5aedd4583f1ea5c9ae06c8becaf8790a3a798b7, message: None }
9. RefUpdateEvent { timestamp: 1680811688.434141, event_tx_id: EventTransactionId(18213), ref_name: ReferenceName("HEAD"), old_oid: 0000000000000000000000000000000000000000, new_oid: d5aedd4583f1ea5c9ae06c8becaf8790a3a798b7, message: None }
10. RefUpdateEvent { timestamp: 1680811688.653575, event_tx_id: EventTransactionId(18213), ref_name: ReferenceName("HEAD"), old_oid: d5aedd4583f1ea5c9ae06c8becaf8790a3a798b7, new_oid: 280ec32f8d67ee43987c6a070d3caf2a0ab80943, message: None }
11. CommitEvent { timestamp: 1680811688.0, event_tx_id: EventTransactionId(18213), commit_oid: NonZeroOid(280ec32f8d67ee43987c6a070d3caf2a0ab80943) }
12. RefUpdateEvent { timestamp: 1680811689.183764, event_tx_id: EventTransactionId(18213), ref_name: ReferenceName("HEAD"), old_oid: 280ec32f8d67ee43987c6a070d3caf2a0ab80943, new_oid: 07998f8217340d0e11cef6ee3fca35f9274652e3, message: None }
13. CommitEvent { timestamp: 1680811689.0, event_tx_id: EventTransactionId(18213), commit_oid: NonZeroOid(07998f8217340d0e11cef6ee3fca35f9274652e3) }
14. RefUpdateEvent { timestamp: 1680811689.803255, event_tx_id: EventTransactionId(18213), ref_name: ReferenceName("HEAD"), old_oid: 07998f8217340d0e11cef6ee3fca35f9274652e3, new_oid: a33ecff310e11b454647cffdc170ce3b4b5c11d9, message: None }
15. CommitEvent { timestamp: 1680811689.0, event_tx_id: EventTransactionId(18213), commit_oid: NonZeroOid(a33ecff310e11b454647cffdc170ce3b4b5c11d9) }

:
O 7f297f6 272d xxxxxxxxxxxxx xxxxxxx xxxx xxxxxxx xxxxx xxxxx xxxx xxxxxx
|\
: o 1cd6256 272d xxxxxxxxxxx xxxxx
: |
: o 7236cf2 266d xxxxxxx xxxxxxxxxxx
: |
: o 3edbdd0 266d (redacted-ref-1) xxx xxxxx xxxxxx xxx xx xxx xxx
:
O 9e0bfbc 241d xxxxxxxxxxxxx xxx xxxxxxxxx xx xx xxxxxx xxxxxx xxx xxxx xxxxxxx
|\
: o 18c5000 239d xxxxx xxxxxx xxxxxxx xx xxxxxxx xx
:
O 91d2fa7 232d xxxxxxxxxxxxxxxx xxx xx xxx xxxxxx xxxxxxxx xxxx
|\
: o d6cb1e8 231d (redacted-ref-2) xxx x xxxxxx xxxxxxxxxx xxxxx xx xxxxxxxx xxx xxxxxx
:
O d463560 231d xxxxxxxxxxxx xxx xxxxxx xxxxxxxx xxxx xxxxxxx xxxxxxxx xxxx xxxx
|\
: o bec200f 231d xxxx xxx xxxx xxxx xx xxxxxxxxxxxx
:
O a0e5b49 178d xxxxxx xxxxxxxxxxxxxxxx xxxxxxx xxxxxx xxxx xxxx xxxx xxxx xxxxx xxxxxx
|\
: o f763ef8 178d (redacted-ref-3) xxxxxxxxxxxxx xxx xxxxxxxxxxxxx xxxxxxx xxxxx
:
O 0605fba 147d xxxxxxxxxxxxxxx xxxxxxxx xxxx xxxx xxxxxxxx xxxx
|\
: o 77d5c0e 146d xxx x xxxxxxxxx xxxxxxx xxxx
:
O 98e46c1 141d xxxxxxxxxxxxxxxx xxxx xxxx xxxxxxx
|\
: o 5833aca 140d xxxxx xxxxx xxxxxx xxxx xxxxxxxx xxxx xxxxx xxxxxxxx xxx xxxxxx xxxxxxxxxxx
:
O 08c40fc 136d xxxxxxxxxxxx xxxxx xx xxxxxx xxxx
|\
: o 585c24e 135d xxx xxx xxxxxxxxxxxxxxxx
:
O 5471e6d 106d xxxxxxxxxxxx xxxxx xxxxxxxxx xx xxxxxx
|\
| o 449f20b 85d xxxxx xxxxxx x xxx xxxxxxx xxxxxxx
| |
| o 6ee0e93 85d xxx xxxxxxx xxx xxxxxxxxx xxxxxxx xx xxxxxx xx
| |
| o 79e4ae6 85d xxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxx xxxxx
| |
| o cd30c7a 85d xxx xxx xxxx xxxxxxxx xxxx
| |
| o 7b74b54 85d xxx xxxxxxxxxxx xxxxxxxxx xxxx xxxxxxxxxx xxxx xx xxxx
| |
| o 3695366 85d xxx xxxxxxx xxx xxxx xxxxxxxxx xx xxxxxx xxx xxx xxxxxxx xx xxxx
| |
| o 04363af 85d xxxxxxxxx xxxxxxx xx xxxxxxxxxx xxx xxxxxxxxxxxx xxxxx
| |
| o ce9bc7b 85d (redacted-ref-4) xxx x xxxxx xxx xxxxxx xxx xx xxxxxxxx xxxx
| |
| o dbc782d 85d (redacted-ref-5) xxx x xxx xxx xxxx xxx xxxxxxx
|
O 0c509a5 85d xxx xxx xxxxxxxxxxxxxxxx
|\
| o 35011bb 85d (redacted-ref-6) xxx x xxxxxx xxxx xx xxxxxx
|\
: o 68dd7db 85d (redacted-ref-7) xxxxxxxxxxxxxx xxxxxxx xxxx xxxx xxxxxxx xxxxx xxxxxxx
:
O 2e69688 44d xxxxxxxxxxxx xxx xxxx xxxxxxx xx xxxxxxx xxxxxx
|\
| o 1c01be2 35d (redacted-ref-8) xxx x xxxx xxxxxxxxxx xxxx xxxxx
|\
: o dcbfe3c 31d xxxxxxxxxxxxxx xxxx xxx xxxxxxxxxxxxxxxxx
:
O 8fe759d 29d xxxxxxxxx xxxxxxxxx x xxxxxxx xxxxxx xxxx xxxxxxx xxxxx xxxx xxxxx xxxx xxxxxxx xxxxxxx xxxx xxxxxxx xxxxx xxxxx xxxxxxx
|\
| o 9b5c294 29d xxxxxxxxxxxxx xxx xxxxxxx xxxxxxxxx
|\
: o a3b5fc0 29d xxxxxxxxxxxxx xxx xxxxxxx xxxxxxxxx
:
O b766c8e 29d xxxxxxxxxxxx xxx xxxxx xxxxxxxxx xxx xxxxxx xxxxxx
|\
| o 2a28986 29d (redacted-ref-9) xxxxx xxxxxxxxxxxxx xxx xxxxxxx
|\
| o 9e1d619 29d xxxxx xxxxxxxxxxxxx xxx xxxxxxx
|\
| o 7a884e1 28d xxxxxx xxxxxxxxxxxxx xxxx xxxxx xxxxxx xxxxxx xxxx xxxxxxx xx xxx xxxxxxx
|\
: o 3948123 28d xxxxxx xxxxxxxxxxxxx xxxx xxxxx xxxxxx xxxxxx xxxx xxxxxxx xx xxx xxxxxxx
:
O fbdd2b8 3d (main) xxxxxxxxxxxxx xxx xxx xxxxx
|\
| o 2e1cee1 1d (redacted-ref-10) xxxxxxxxxxxxxx xxxxxxx xx xxxxxx xx xxxxxxxxxxxxxxxxxxxxxxxxxxxx
|\
| o 44dea43 1d xxxxxxxxxxxx xxx xxxxxxxxxxx xxxx xxxxxxx
|\
| o 89f5295 1d (redacted-ref-11) xxxxx xxxxxxxxxxxx xxxx xxxx xxxx xxxxx xxxxxxxxx xxx xxx xxxxxxx
|\
| o aadb365 1d xxxx xxxxxx xxxxxxxxxx
|\
| o d889776 1d (redacted-ref-12) xxxxxxxxxxxx xxxx xxxxxx xxxx xxxxxxxxx xxxxx xxxxx xx xxx xxxxxx xxxx
|\
| o e6244c8 1d (redacted-ref-13) xxx x xxx xxx xxxx xxx xxxx xxxx
|\
| o 645ca51 1d (redacted-ref-14) xxxxxxxxxxxxx xxxx xxx xxxxx xxxxx xxxxxxxx xxx
|\
| o cb1eb9d 1d xxxx xxxxx xxxx xxxxxxxxxxxx x xxxx xxxxx
|
o 4098bbc 1d (redacted-ref-15) xxx xxx xxxxxxx xxx xxxxxx xxxxxxxxx xxxxxxx
|\
| x a669788 1d xxx xxxx xxxxxx xx xxxxxxx xxxxxxx xxxxxxxxxxx
| |
| x d5aedd4 6m (redacted-ref-16) xxxx xxxxxxxxxxxxxxxxxxxxxxxx xx xx
| |
| x 280ec32 6m (redacted-ref-17) xxxxxxxxxxxxx xxxxx xx xxx xxxxxxx xxxxx
| |
| x 07998f8 6m (redacted-ref-18) xxxxxxxxxxxxx xxxxxx xxx xxxx xxxxxxxx
| |
| x a33ecff 6m (redacted-ref-19) xxxxxxxxxxxx xxx xxxxxx xxxxxxxxxxxx xx xxxxxxx xxxx
| |
| x 54ca0db 5m (redacted-ref-20) xxxxxxxxxxxxx xxx xxx xxxx xxx xxxxxx xxxxxxxx xxxx
| |
| x 7e65a94 5m (redacted-ref-21) xxxx xxxx xxxxx xx xxxxx
|
o 1501ce0 4m xxx xxxx xxxxxx xx xxxxxxx xxxxxxx xxxxxxxxxxx
|
o cfadb11 3m xxxxxxxxxxxxx xxxxx xx xxx xxxxxxx xxxxx
|
o 9935b5c 3m xxxxxxxxxxxxx xxxxxx xxx xxxx xxxxxxxx
|
o 019ba2f 3m xxxxxxxxxxxx xxx xxxxxx xxxxxxxxxxxx xx xxxxxxx xxxx
|
o d0c7d4f 3m xxxxxxxxxxxxx xxx xxx xxxx xxx xxxxxx xxxxxxxx xxxx
|
o c45a46e 3m xxxx xxxx xxxxx xx xxxxx
|
@ 9dd5203 3m (redacted-ref-0) xxxx xxxx xxxxxxxxxxxx

Event ID: 27134, transaction ID: 18209 (message: rebase)

1. RefUpdateEvent { timestamp: 1680810622.101234, event_tx_id: EventTransactionId(18209), ref_name: ReferenceName("HEAD"), old_oid: 0a9244f08193ebfc70030f55e037f2fdb993b1e4, new_oid: 83cdc1106240609a2d937024c2551b7ab6edefa5, message: None }
2. CommitEvent { timestamp: 1680810617.0, event_tx_id: EventTransactionId(18209), commit_oid: NonZeroOid(83cdc1106240609a2d937024c2551b7ab6edefa5) }
3. RewriteEvent { timestamp: 1680810622.570672, event_tx_id: EventTransactionId(18209), old_commit_oid: e690d4a91cb2f63565935c5f5fdfc0064e46a3a0, new_commit_oid: 30b2bfc1d1976c614d6db40a4c2769050802739c }
4. RewriteEvent { timestamp: 1680810622.570672, event_tx_id: EventTransactionId(18209), old_commit_oid: a34f04df1cc6498c622f9cfc6dffec90db0178be, new_commit_oid: 1fc6f1fa07431c64ea5203c8c6735843be85fe48 }
5. RewriteEvent { timestamp: 1680810622.570672, event_tx_id: EventTransactionId(18209), old_commit_oid: 9d47f60eace81a29d4d4854d3d341492d8128026, new_commit_oid: f018727d9086002c27909290b7ac28596c48be16 }
6. RewriteEvent { timestamp: 1680810622.570672, event_tx_id: EventTransactionId(18209), old_commit_oid: 3d96f02dbc4688581821fbbf2bb41025865c06fe, new_commit_oid: ba1018f8de416d405eac628f31492f7cd622b71e }
7. RewriteEvent { timestamp: 1680810622.570672, event_tx_id: EventTransactionId(18209), old_commit_oid: d640e9ef9dbc76c57ccd86e1b3e2e66d7e41eec6, new_commit_oid: 0a9244f08193ebfc70030f55e037f2fdb993b1e4 }
8. RewriteEvent { timestamp: 1680810622.570672, event_tx_id: EventTransactionId(18209), old_commit_oid: 3860cb2cb2dfa768b99fd84f9365ed117d15b7bd, new_commit_oid: 83cdc1106240609a2d937024c2551b7ab6edefa5 }
9. RefUpdateEvent { timestamp: 1680810622.649155, event_tx_id: EventTransactionId(18209), ref_name: ReferenceName("refs/heads/redacted-ref-19"), old_oid: 9d47f60eace81a29d4d4854d3d341492d8128026, new_oid: f018727d9086002c27909290b7ac28596c48be16, message: None }
10. RefUpdateEvent { timestamp: 1680810622.649155, event_tx_id: EventTransactionId(18209), ref_name: ReferenceName("refs/heads/redacted-ref-21"), old_oid: d640e9ef9dbc76c57ccd86e1b3e2e66d7e41eec6, new_oid: 0a9244f08193ebfc70030f55e037f2fdb993b1e4, message: None }
11. RefUpdateEvent { timestamp: 1680810622.649155, event_tx_id: EventTransactionId(18209), ref_name: ReferenceName("refs/heads/redacted-ref-20"), old_oid: 3d96f02dbc4688581821fbbf2bb41025865c06fe, new_oid: ba1018f8de416d405eac628f31492f7cd622b71e, message: None }
12. RefUpdateEvent { timestamp: 1680810622.649155, event_tx_id: EventTransactionId(18209), ref_name: ReferenceName("refs/heads/redacted-ref-18"), old_oid: a34f04df1cc6498c622f9cfc6dffec90db0178be, new_oid: 1fc6f1fa07431c64ea5203c8c6735843be85fe48, message: None }
13. RefUpdateEvent { timestamp: 1680810622.649155, event_tx_id: EventTransactionId(18209), ref_name: ReferenceName("refs/heads/redacted-ref-17"), old_oid: e690d4a91cb2f63565935c5f5fdfc0064e46a3a0, new_oid: 30b2bfc1d1976c614d6db40a4c2769050802739c, message: None }
14. RefUpdateEvent { timestamp: 1680810622.649155, event_tx_id: EventTransactionId(18209), ref_name: ReferenceName("refs/heads/redacted-ref-0"), old_oid: 3860cb2cb2dfa768b99fd84f9365ed117d15b7bd, new_oid: 83cdc1106240609a2d937024c2551b7ab6edefa5, message: None }
15. WorkingCopySnapshot { timestamp: 1680810622.692837, event_tx_id: EventTransactionId(18209), head_oid: 83cdc1106240609a2d937024c2551b7ab6edefa5, commit_oid: NonZeroOid(17ae1eb944154e0cf8d5df36133ce6ef70fda4b0), ref_name: None }
16. RefUpdateEvent { timestamp: 1680810622.845813, event_tx_id: EventTransactionId(18209), ref_name: ReferenceName("HEAD"), old_oid: 83cdc1106240609a2d937024c2551b7ab6edefa5, new_oid: 956339f26b4b78f6a9b01887ca172cad7aa26607, message: None }

:
O 7f297f6 272d xxxxxxxxxxxxx xxxxxxx xxxx xxxxxxx xxxxx xxxxx xxxx xxxxxx
|\
: o 1cd6256 272d xxxxxxxxxxx xxxxx
: |
: o 7236cf2 266d xxxxxxx xxxxxxxxxxx
: |
: o 3edbdd0 266d (redacted-ref-1) xxx xxxxx xxxxxx xxx xx xxx xxx
:
O 9e0bfbc 241d xxxxxxxxxxxxx xxx xxxxxxxxx xx xx xxxxxx xxxxxx xxx xxxx xxxxxxx
|\
: o 18c5000 239d xxxxx xxxxxx xxxxxxx xx xxxxxxx xx
:
O 91d2fa7 232d xxxxxxxxxxxxxxxx xxx xx xxx xxxxxx xxxxxxxx xxxx
|\
: o d6cb1e8 231d (redacted-ref-2) xxx x xxxxxx xxxxxxxxxx xxxxx xx xxxxxxxx xxx xxxxxx
:
O d463560 231d xxxxxxxxxxxx xxx xxxxxx xxxxxxxx xxxx xxxxxxx xxxxxxxx xxxx xxxx
|\
: o bec200f 231d xxxx xxx xxxx xxxx xx xxxxxxxxxxxx
:
O a0e5b49 178d xxxxxx xxxxxxxxxxxxxxxx xxxxxxx xxxxxx xxxx xxxx xxxx xxxx xxxxx xxxxxx
|\
: o f763ef8 178d (redacted-ref-3) xxxxxxxxxxxxx xxx xxxxxxxxxxxxx xxxxxxx xxxxx
:
O 0605fba 147d xxxxxxxxxxxxxxx xxxxxxxx xxxx xxxx xxxxxxxx xxxx
|\
: o 77d5c0e 146d xxx x xxxxxxxxx xxxxxxx xxxx
:
O 98e46c1 141d xxxxxxxxxxxxxxxx xxxx xxxx xxxxxxx
|\
: o 5833aca 140d xxxxx xxxxx xxxxxx xxxx xxxxxxxx xxxx xxxxx xxxxxxxx xxx xxxxxx xxxxxxxxxxx
:
O 08c40fc 136d xxxxxxxxxxxx xxxxx xx xxxxxx xxxx
|\
: o 585c24e 135d xxx xxx xxxxxxxxxxxxxxxx
:
O 5471e6d 106d xxxxxxxxxxxx xxxxx xxxxxxxxx xx xxxxxx
|\
| o 449f20b 85d xxxxx xxxxxx x xxx xxxxxxx xxxxxxx
| |
| o 6ee0e93 85d xxx xxxxxxx xxx xxxxxxxxx xxxxxxx xx xxxxxx xx
| |
| o 79e4ae6 85d xxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxx xxxxx
| |
| o cd30c7a 85d xxx xxx xxxx xxxxxxxx xxxx
| |
| o 7b74b54 85d xxx xxxxxxxxxxx xxxxxxxxx xxxx xxxxxxxxxx xxxx xx xxxx
| |
| o 3695366 85d xxx xxxxxxx xxx xxxx xxxxxxxxx xx xxxxxx xxx xxx xxxxxxx xx xxxx
| |
| o 04363af 85d xxxxxxxxx xxxxxxx xx xxxxxxxxxx xxx xxxxxxxxxxxx xxxxx
| |
| o ce9bc7b 85d (redacted-ref-4) xxx x xxxxx xxx xxxxxx xxx xx xxxxxxxx xxxx
| |
| o dbc782d 85d (redacted-ref-5) xxx x xxx xxx xxxx xxx xxxxxxx
|
O 0c509a5 85d xxx xxx xxxxxxxxxxxxxxxx
|\
| o 35011bb 85d (redacted-ref-6) xxx x xxxxxx xxxx xx xxxxxx
|\
: o 68dd7db 85d (redacted-ref-7) xxxxxxxxxxxxxx xxxxxxx xxxx xxxx xxxxxxx xxxxx xxxxxxx
:
O 2e69688 44d xxxxxxxxxxxx xxx xxxx xxxxxxx xx xxxxxxx xxxxxx
|\
| o 1c01be2 35d (redacted-ref-8) xxx x xxxx xxxxxxxxxx xxxx xxxxx
|\
: o dcbfe3c 31d xxxxxxxxxxxxxx xxxx xxx xxxxxxxxxxxxxxxxx
:
O 8fe759d 29d xxxxxxxxx xxxxxxxxx x xxxxxxx xxxxxx xxxx xxxxxxx xxxxx xxxx xxxxx xxxx xxxxxxx xxxxxxx xxxx xxxxxxx xxxxx xxxxx xxxxxxx
|\
| o 9b5c294 29d xxxxxxxxxxxxx xxx xxxxxxx xxxxxxxxx
|\
: o a3b5fc0 29d xxxxxxxxxxxxx xxx xxxxxxx xxxxxxxxx
:
O b766c8e 29d xxxxxxxxxxxx xxx xxxxx xxxxxxxxx xxx xxxxxx xxxxxx
|\
| o 2a28986 29d (redacted-ref-9) xxxxx xxxxxxxxxxxxx xxx xxxxxxx
|\
| o 9e1d619 29d xxxxx xxxxxxxxxxxxx xxx xxxxxxx
|\
| o 7a884e1 28d xxxxxx xxxxxxxxxxxxx xxxx xxxxx xxxxxx xxxxxx xxxx xxxxxxx xx xxx xxxxxxx
|\
: o 3948123 28d xxxxxx xxxxxxxxxxxxx xxxx xxxxx xxxxxx xxxxxx xxxx xxxxxxx xx xxx xxxxxxx
:
O fbdd2b8 3d (main) xxxxxxxxxxxxx xxx xxx xxxxx
|\
| o 2e1cee1 1d (redacted-ref-10) xxxxxxxxxxxxxx xxxxxxx xx xxxxxx xx xxxxxxxxxxxxxxxxxxxxxxxxxxxx
|\
| o 44dea43 1d xxxxxxxxxxxx xxx xxxxxxxxxxx xxxx xxxxxxx
|\
| o 89f5295 1d (redacted-ref-11) xxxxx xxxxxxxxxxxx xxxx xxxx xxxx xxxxx xxxxxxxxx xxx xxx xxxxxxx
|\
| o aadb365 1d xxxx xxxxxx xxxxxxxxxx
|\
| o d889776 1d (redacted-ref-12) xxxxxxxxxxxx xxxx xxxxxx xxxx xxxxxxxxx xxxxx xxxxx xx xxx xxxxxx xxxx
|\
| o e6244c8 1d (redacted-ref-13) xxx x xxx xxx xxxx xxx xxxx xxxx
|\
| o 645ca51 1d (redacted-ref-14) xxxxxxxxxxxxx xxxx xxx xxxxx xxxxx xxxxxxxx xxx
|\
| o cb1eb9d 1d xxxx xxxxx xxxx xxxxxxxxxxxx x xxxx xxxxx
|
o 4098bbc 1d (redacted-ref-15) xxx xxx xxxxxxx xxx xxxxxx xxxxxxxxx xxxxxxx
|\
| x a669788 1d xxx xxxx xxxxxx xx xxxxxxx xxxxxxx xxxxxxxxxxx
| |
| x d5aedd4 6m (redacted-ref-16) xxxx xxxxxxxxxxxxxxxxxxxxxxxx xx xx
| |
| x 280ec32 6m (redacted-ref-17) xxxxxxxxxxxxx xxxxx xx xxx xxxxxxx xxxxx
| |
| x 07998f8 6m (redacted-ref-18) xxxxxxxxxxxxx xxxxxx xxx xxxx xxxxxxxx
| |
| x a33ecff 6m (redacted-ref-19) xxxxxxxxxxxx xxx xxxxxx xxxxxxxxxxxx xx xxxxxxx xxxx
| |
| x 54ca0db 5m (redacted-ref-20) xxxxxxxxxxxxx xxx xxx xxxx xxx xxxxxx xxxxxxxx xxxx
| |
| x 7e65a94 5m (redacted-ref-21) xxxx xxxx xxxxx xx xxxxx
|
o 1501ce0 4m xxx xxxx xxxxxx xx xxxxxxx xxxxxxx xxxxxxxxxxx
|
o cfadb11 3m xxxxxxxxxxxxx xxxxx xx xxx xxxxxxx xxxxx
|
o 9935b5c 3m xxxxxxxxxxxxx xxxxxx xxx xxxx xxxxxxxx
|
o 019ba2f 3m xxxxxxxxxxxx xxx xxxxxx xxxxxxxxxxxx xx xxxxxxx xxxx
|
o d0c7d4f 3m xxxxxxxxxxxxx xxx xxx xxxx xxx xxxxxx xxxxxxxx xxxx
|
o c45a46e 3m xxxx xxxx xxxxx xx xxxxx
|
@ 9dd5203 3m (redacted-ref-0) xxxx xxxx xxxxxxxxxxxx

[arxanas]

If you try to restrict the restack operation to just your draft commits with git restack 'draft()', does it work? (Or if you constrain it in some other way such that it doesn't include main.) You can also try git branchless repair and see if it helps (which reconciles the internal event log database with the real state of refs on disk).

[alan-nf]

Oh neat, git restack --merge "draft()" works around whatever is going on. git branchless repair did not, which is to say that restack still wanted to rebase the public main branch and failed after repair.

[arxanas]

That should probably be the default. There was a time when we marked "anomalous" commits (public commits which had been rewritten), but this was never useful, so we got rid of it. Likewise, we also never want to restack public commits, and it just causes the kind of error message that you see.