summaryrefslogtreecommitdiff
path: root/Git
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2015-01-06 17:18:12 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2015-01-06 17:18:12 -0400
commitbc620991aa586d6758e5ef997342899edc87bc4a (patch)
treeddaa6ba7ac21ba08d60603e1670f4c0be7e1948a /Git
parentab23d1549d615b42ce77545987b8efc59be9068f (diff)
direct mode merge relative path trickiness
This fixes 9 test suite failures. There are some tricky things going on with the paths to the index file, and git's working directory, which are hard to get right with relative paths. So, I switched back to absolute here, at least for now. Only 2 test suite failures remain on this branch, but there are other potential problems the test suite doesn't catch. Including some calls to setCurrentDirectory -- I was wrong and git-annex does do that in a few places, like when generating a view.
Diffstat (limited to 'Git')
0 files changed, 0 insertions, 0 deletions