blob: 9e7d1928a2ba3609e2bfbcfe2ea760bfe485fe03 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
|
[[!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.
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>
"""]]
|
