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
and then it duplicated all of the commits while rebasing them
so now i have to go manually hide all of these
This happens all the time whenever I rebase with git sync, and I have no idea why. Have you seen this before and do you know what I can try to see if I can fix this? I can try to recreate a minimal repeatable example but I feel like you must have seen this before.
Hi @Kimeiga, it looks like you don't have any of the expected Git hooks installed. Did you run git branchless init in this repo?
git movecan be used without running init, and it will behave more or less as expected if you're using it with the normal suite of Git tools, but git-branchless itself relies on the post-rewrite hook to know that it should hide the old versions of the commits, which will still show up in the smartlog.
Possibly the real remediation here is to make it more obvious when Git hooks might not be installed properly. There should certainly be an auxiliary warning when running bug-report (many people have misconfigured hooks and aliases). It might also be worth including a general health check in the smartlog output.
Description of the bug
https://pastebin.com/Qsurfkdb
I don't have a minimal example of this yet but
i just ran git sl
and then git sync --merge -p
and then it duplicated all of the commits while rebasing them
so now i have to go manually hide all of these
This happens all the time whenever I rebase with git sync, and I have no idea why. Have you seen this before and do you know what I can try to see if I can fix this? I can try to recreate a minimal repeatable example but I feel like you must have seen this before.
here is my .gitconfig
https://pastebin.com/NS92fzZU
and my git.plugin.zsh that I don't really use but here anyways:
https://pastebin.com/DfdndaCd
Expected behavior
I expected
git sync -p --merge
to just rebase the branches normally and not duplicate the commitsActual behavior
it duplicates the commits whenever it rebases
Version of
rustc
rustc 1.78.0 (9b00956e5 2024-04-29)
Automated bug report
Software version
git-branchless 0.9.0
Operating system
macOS 14.6.1 (Darwin 23.6.0)
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: 22754, transaction ID: 11343 (message: sync)
WorkingCopySnapshot { timestamp: 1725374235.616942, event_tx_id: Id(11343), head_oid: 3178a38f424c002fc576e029f777421d297cf149, commit_oid: NonZeroOid(cdd43e7449ee0955112aae2df087009a0458c608), ref_name: None }
WorkingCopySnapshot { timestamp: 1725374235.953443, event_tx_id: Id(11343), head_oid: 3178a38f424c002fc576e029f777421d297cf149, commit_oid: NonZeroOid(cdd43e7449ee0955112aae2df087009a0458c608), ref_name: None }
WorkingCopySnapshot { timestamp: 1725374236.158518, event_tx_id: Id(11343), head_oid: 3178a38f424c002fc576e029f777421d297cf149, commit_oid: NonZeroOid(cdd43e7449ee0955112aae2df087009a0458c608), ref_name: None }
WorkingCopySnapshot { timestamp: 1725374236.392196, event_tx_id: Id(11343), head_oid: 3178a38f424c002fc576e029f777421d297cf149, commit_oid: NonZeroOid(cdd43e7449ee0955112aae2df087009a0458c608), ref_name: None }
WorkingCopySnapshot { timestamp: 1725374236.620205, event_tx_id: Id(11343), head_oid: 3178a38f424c002fc576e029f777421d297cf149, commit_oid: NonZeroOid(cdd43e7449ee0955112aae2df087009a0458c608), ref_name: None }
WorkingCopySnapshot { timestamp: 1725374236.847421, event_tx_id: Id(11343), head_oid: 3178a38f424c002fc576e029f777421d297cf149, commit_oid: NonZeroOid(cdd43e7449ee0955112aae2df087009a0458c608), ref_name: None }
Event ID: 22753, transaction ID: 11341 (message: checkout)
WorkingCopySnapshot { timestamp: 1725049301.841517, event_tx_id: Id(11341), head_oid: 88de89cd275c6d6f3b11e69e59b813deb2bcf8d2, commit_oid: NonZeroOid(29016a173f98514177eb300f0a4530eb041abfd6), ref_name: Some(ReferenceName("refs/heads/redacted-ref-4")) }
Event ID: 22752, transaction ID: 11336 (message: checkout)
WorkingCopySnapshot { timestamp: 1725048218.668019, event_tx_id: Id(11336), head_oid: e257cf479317e574aaa8762c855d28cdd26dce4b, commit_oid: NonZeroOid(abeaa217b92b878544817ae4d057b5b0749ece98), ref_name: Some(ReferenceName("refs/heads/master")) }
Event ID: 22751, transaction ID: 11335 (message: checkout)
WorkingCopySnapshot { timestamp: 1725046176.369339, event_tx_id: Id(11335), head_oid: 9f5ef1870d1f43cc09cae1b28d4a8af47527be91, commit_oid: NonZeroOid(bf7ea8912f1005143fba3cb8957b3605ff5ca63c), ref_name: Some(ReferenceName("refs/heads/redacted-ref-3")) }
Event ID: 22750, transaction ID: 11334 (message: reference-transaction)
RefUpdateEvent { timestamp: 1725043530.37901, event_tx_id: Id(11334), ref_name: ReferenceName("refs/remotes/redacted-ref-7"), old_oid: dcb0e4e3b7f453a87e22b07094ae9dcbbde3ecc0, new_oid: 00b85cd465181369f3ad6fbc7e5fc98972cd06d7, message: None }
Version of
git-branchless
No response
Version of
git
No response
The text was updated successfully, but these errors were encountered: