diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-07-09 15:32:21 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-07-09 15:32:21 -0400 |
| commit | 12d480c8ee523aab1bcf80cac60b7681c2b96516 (patch) | |
| tree | e442da0f66c0f3061b75c2878e30bb5ccbd9eeb7 | |
| parent | a0cac41ba8c26e0431ea2527e2b462fa00db71d1 (diff) | |
| parent | 3ea6a2d05e5f4b66c619c5e4b8636e1802796446 (diff) | |
Merge branch 'master' of ssh://git-annex.branchable.com
| -rw-r--r-- | doc/bugs/bad_merge_commit_deleting_all_files/comment_7_24dea380fcf470e0ea488dece0410f37._comment | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/doc/bugs/bad_merge_commit_deleting_all_files/comment_7_24dea380fcf470e0ea488dece0410f37._comment b/doc/bugs/bad_merge_commit_deleting_all_files/comment_7_24dea380fcf470e0ea488dece0410f37._comment new file mode 100644 index 000000000..0cb39e7c8 --- /dev/null +++ b/doc/bugs/bad_merge_commit_deleting_all_files/comment_7_24dea380fcf470e0ea488dece0410f37._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + ip="209.250.56.55" + subject="more confirmation of race theory" + date="2014-07-09T19:26:55Z" + content=""" +@purpleidea showed me his git log, and as I had expected, there were previous empty commits immediately before the 2 commits that removes all of his files (which happened independenctly on 2 different machines running the assistant). This is consistent with my suspicion it's a race. Note that the assistant's git ref watcher can easily run multiple merges concurrently if multiple refs change. +"""]] |