bisection

1 files changed, 34 insertions, 0 deletions

diff --git a/doc/bugs/git-annex_in_nixpkgs_fails_with_git-2.13.0/comment_1_364f69b47889486ab006811406324c44._comment b/doc/bugs/git-annex_in_nixpkgs_fails_with_git-2.13.0/comment_1_364f69b47889486ab006811406324c44._comment
new file mode 100644
index 000000000..fc0304b9a
--- /dev/null
+++ b/doc/bugs/git-annex_in_nixpkgs_fails_with_git-2.13.0/comment_1_364f69b47889486ab006811406324c44._comment
@@ -0,0 +1,34 @@
+[[!comment format=mdwn
+ username="joey"
+ subject="""comment 1"""
+ date="2017-05-16T15:42:53Z"
+ content="""
+Not nix-specific, I can reproduce with self-built git.
+
+Bisecting git itself (rather than nix):
+
+	f57f37e2e1bf11ab4cdfd221ad47e961ba9353a0 is the first bad commit
+	commit f57f37e2e1bf11ab4cdfd221ad47e961ba9353a0
+	Author: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
+	Date:   Sun Mar 26 09:42:24 2017 +0700
+	
+	    files-backend: remove the use of git_path()
+
+That commit seems has to do with paths used for refs, and the test suite is
+failing due to something involving pushing/merging the
+synced/master branch. So, it's looking like a git bug.
+
+In particular, this just seems outright wrong:
+
+	From ../../.t/tmprepo44
+	 * [new branch]      git-annex     -> r1/git-annex
+	 * [new branch]      master        -> r1/master
+	 * [new branch]      synced/master -> r1/synced/master
+	merge: refs/remotes/r1/master - not something we can merge
+	merge: refs/remotes/r1/synced/master - not something we can merge
+
+So, it's just pulled synced/master to r1/synced/master, but then it claims
+refs/remotes/r1/synced/master is not mergable.
+
+Need to boil this down to a useful bug report against git..
+"""]]