[pkg-go] Bug#956117: Syncing git repos is unreliable and cause undefined git repo state

Nicholas D Steeves nsteeves at gmail.com
Tue Apr 7 16:04:49 BST 2020


Package: syncthing
Version: 1.0.0~ds1-1+b11
Severity: normal

I thought it would be neat to sync all my Debian work between my desktop and laptop with syncthing, but ran into the following issue:

Steps to reproduce:

1. Setup two nodes, and add a ~/devel filled with git repos as a sync target.
2. Wait for everything to sync.
3. Git rebase one repo on one node (A).
4. Syncthing picks up the changes and syncs to remote node (B).
5. Git repo on remote node (B) ends up in inconsistent state.

Workaround:

On the node that rebased (A),

  $ mv ~/devel/foobar-repo ~/devel/foobar-repo_rebased

This forces a full sync to (B) allowing one to continue working.

At a minimum I think this limitation should be documented somewhere.
I'm not sure if `git rebase --committer-date-is-author-date` could be
detected...if it could be detected then that would be the ideal fix.
so I'll leave cloning this bug into a documentation or an upstream
fix bug up to you ;-)


Best,
Nicholas



More information about the Pkg-go-maintainers mailing list