You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
hint: there are 4 abandoned commits in your commit graph
hint: to fix this, run: git restack
hint: disable this hint by running: git config --global branchless.hint.smartlogFixAbandoned false
However, when I run git restack:
No abandoned commits to restack.
branchless: processing 1 update: branch msh-dev
Finished restacking branches.
Therefore the hint always stays and I cannot get rid of it (unless I disable this feature).
I don't know how I enter this state, but any tools/commands that can help fix this state is appreciated.
Expected behavior
git sl and git restack should agree with each other
#!/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
You might be able to work around this by running git unhide 065fc06. I haven't been able to figure out what situation will cause a rewrite to 00000000. One solution here might be to never consider public commits to be "rewritten".
Description of the bug
The end of
git sl
says:However, when I run
git restack
:Therefore the
hint
always stays and I cannot get rid of it (unless I disable this feature).I don't know how I enter this state, but any tools/commands that can help fix this state is appreciated.
Expected behavior
git sl
andgit restack
should agree with each otherActual behavior
(commit message hidden)
Version of
rustc
rustc 1.72.1 (d5c2e9c34 2023-09-13)
Automated bug report
Software version
git-branchless 0.8.0
Operating system
Linux 5.4.210-4-velinux1-amd64
Command-line
Environment variables
Git version
Hooks
Show 7 hooks
Hook
post-applypatch
Hook
post-checkout
Hook
post-commit
Hook
post-merge
Hook
post-rewrite
Hook
pre-auto-gc
Hook
reference-transaction
Events
Show 5 events
Event ID: 210, transaction ID: 129 (message: restack)
RefUpdateEvent { timestamp: 1696030618.7204208, event_tx_id: EventTransactionId(129), ref_name: ReferenceName("refs/heads/msh-dev"), old_oid: 065fc065424deb90e96001e6b5956d374430145a, new_oid: 065fc065424deb90e96001e6b5956d374430145a, message: None }
Event ID: 209, transaction ID: 128 (message: restack)
RefUpdateEvent { timestamp: 1696030617.7008605, event_tx_id: EventTransactionId(128), ref_name: ReferenceName("refs/heads/msh-dev"), old_oid: 065fc065424deb90e96001e6b5956d374430145a, new_oid: 065fc065424deb90e96001e6b5956d374430145a, message: None }
Event ID: 208, transaction ID: 127 (message: restack)
RefUpdateEvent { timestamp: 1696030616.676665, event_tx_id: EventTransactionId(127), ref_name: ReferenceName("refs/heads/msh-dev"), old_oid: 065fc065424deb90e96001e6b5956d374430145a, new_oid: 065fc065424deb90e96001e6b5956d374430145a, message: None }
Event ID: 207, transaction ID: 126 (message: restack)
RefUpdateEvent { timestamp: 1696030614.5262668, event_tx_id: EventTransactionId(126), ref_name: ReferenceName("refs/heads/msh-dev"), old_oid: 065fc065424deb90e96001e6b5956d374430145a, new_oid: 065fc065424deb90e96001e6b5956d374430145a, message: None }
Event ID: 206, transaction ID: 125 (message: restack)
RefUpdateEvent { timestamp: 1696030314.9925008, event_tx_id: EventTransactionId(125), ref_name: ReferenceName("refs/heads/msh-dev"), old_oid: 065fc065424deb90e96001e6b5956d374430145a, new_oid: 065fc065424deb90e96001e6b5956d374430145a, message: None }
Version of
git-branchless
No response
Version of
git
No response
The text was updated successfully, but these errors were encountered: