Skip to content
Snippets Groups Projects
Unverified Commit 842449b0 authored by Joey Hess's avatar Joey Hess
Browse files

linuxstandalone: Fix a regression that broke git-remote-https.

parent dfd9f4e5
Branches
Tags
No related merge requests found
......@@ -56,16 +56,24 @@ installGitLibs topdir = do
if issymlink
then do
-- many git-core files may symlink to eg
-- ../../git. The link targets are put
-- into a subdirectory so all links to
-- .../git get the same binary.
-- ../../bin/git, which is located outside
-- the git-core directory. The target of
-- such links is installed into a bin
-- directory, and the links repointed to it.
--
-- Other git-core files symlink to a file
-- beside them in the directory. Those
-- links can be copied as-is.
linktarget <- readSymbolicLink f
let linktarget' = gitcoredestdir </> "bin" </> takeFileName linktarget
createDirectoryIfMissing True (takeDirectory linktarget')
L.readFile f >>= L.writeFile linktarget'
nukeFile destf
rellinktarget <- relPathDirToFile (takeDirectory destf) linktarget'
createSymbolicLink rellinktarget destf
if takeFileName linktarget == linktarget
then cp f destf
else do
let linktarget' = gitcoredestdir </> "bin" </> takeFileName linktarget
createDirectoryIfMissing True (takeDirectory linktarget')
L.readFile f >>= L.writeFile linktarget'
nukeFile destf
rellinktarget <- relPathDirToFile (takeDirectory destf) linktarget'
createSymbolicLink rellinktarget destf
else cp f destf
-- install git's template files
......
......@@ -5,6 +5,7 @@ git-annex (7.20191107) UNRELEASED; urgency=medium
particularly url download errors.
* Fix a crash (STM deadlock) when -J is used with multiple files
that point to the same key.
* linuxstandalone: Fix a regression that broke git-remote-https.
-- Joey Hess <id@joeyh.name> Mon, 11 Nov 2019 15:59:47 -0400
......
......@@ -166,6 +166,7 @@ linuxstandalone:
cp /usr/share/file/magic.mgc "$(LINUXSTANDALONE_DEST)/magic"
cp /usr/share/i18n -a "$(LINUXSTANDALONE_DEST)"
read me
./Build/LinuxMkLibs "$(LINUXSTANDALONE_DEST)"
$(MAKE) install-mans DESTDIR="$(LINUXSTANDALONE_DEST)"
......
......@@ -75,3 +75,5 @@ Unfortunately in datalad we had no test testing cloning over https, so I added s
[[!meta author=yoh]]
[[!tag projects/datalad]]
> [[fixed|done]] --[[Joey]]
[[!comment format=mdwn
username="joey"
subject="""comment 1"""
date="2019-11-14T18:14:35Z"
content="""
It will either be caused by 5463f97ca216cd261f7a1da08aa8a62cef415a71 or by
a new version of git reorging files (or both).
"""]]
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment