From 3c66a7bfd120041a1fb29afa4ff5981d0721e1e2 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 16 May 2017 13:11:15 -0400 Subject: forwardeed to git ML --- .../comment_1_364f69b47889486ab006811406324c44._comment | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 index fc0304b9a..9e7d1928a 100644 --- 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 @@ -30,5 +30,9 @@ In particular, this just seems outright wrong: 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.. +This only affects adjusted branches because git has a reversion in the +`GIT_COMMON_DIR` that they use. + +Posted on the git ML about this reversion, message-id +<20170516171028.5eagqr2sw5a2i77d@kitenet.net> """]] -- cgit v1.2.3