git-annex/doc/bugs/Assistant_merge_loop.mdwn

The assistant appears to be in a merge loop with at least two of my repos. It's creating thousands of merge commits without any changes. One repository that contains around 600 files that change very very rarely now has 63528 commits.

Here's a screenshot from tig: [[https://ssl.zerodogg.org/~zerodogg/private/tmp/Skjermdump_fra_2014-07-05_07:09:22-2014-07-05.png]]

I can privately provide a copy of the git repo itself if needed.

Using the standalone build, 64bit, on ArchLinux, Fedora 20 and Ubuntu 14.04.

    $ git annex version
    git-annex version: 5.20140610-g5ec8bcf
    build flags: Assistant Webapp Webapp-secure Pairing Testsuite S3 WebDAV Inotify DBus DesktopNotify XMPP DNS Feeds Quvi TDFA CryptoHash
    key/value backends: SHA256E SHA1E SHA512E SHA224E SHA384E SKEIN256E SKEIN512E SHA256 SHA1 SHA512 SHA224 SHA384 SKEIN256 SKEIN512 WORM URL
    remote types: git gcrypt S3 bup directory rsync web webdav tahoe glacier ddar hook external
    local repository version: 5
    supported repository version: 5
    upgrade supported from repository versions: 0 1 2 4

> [[fixed|done]]. Note that 5.20140708 contained an incomplete fix for this
> bug. --[[Joey]]
2014-07-05 05:15:58 +00:00			`The assistant appears to be in a merge loop with at least two of my repos. It's creating thousands of merge commits without any changes. One repository that contains around 600 files that change very very rarely now has 63528 commits.`

			`Here's a screenshot from tig: [[https://ssl.zerodogg.org/~zerodogg/private/tmp/Skjermdump_fra_2014-07-05_07:09:22-2014-07-05.png]]`

			`I can privately provide a copy of the git repo itself if needed.`

			`Using the standalone build, 64bit, on ArchLinux, Fedora 20 and Ubuntu 14.04.`

			`$ git annex version`
			`git-annex version: 5.20140610-g5ec8bcf`
			`build flags: Assistant Webapp Webapp-secure Pairing Testsuite S3 WebDAV Inotify DBus DesktopNotify XMPP DNS Feeds Quvi TDFA CryptoHash`
			`key/value backends: SHA256E SHA1E SHA512E SHA224E SHA384E SKEIN256E SKEIN512E SHA256 SHA1 SHA512 SHA224 SHA384 SKEIN256 SKEIN512 WORM URL`
			`remote types: git gcrypt S3 bup directory rsync web webdav tahoe glacier ddar hook external`
			`local repository version: 5`
			`supported repository version: 5`
			`upgrade supported from repository versions: 0 1 2 4`
Really fix bug that caused the assistant to make many unncessary empty merge commits. 2014-07-09 19:18:00 +00:00
			`> [[fixed\|done]]. Note that 5.20140708 contained an incomplete fix for this`
			`> bug. --[[Joey]]`