When re-execing git-annex, use current program location, rather than ~/.config/git-annex/program, when possible.
Most of the time, there will be no discreprancy between programPath and readProgramFile. But, the programFile might have been written by an old version of git-annex that is still installed, while a newer one is currently running. In this case, we want to run the same one that's currently running. This is especially important for things like the GIT_SSH=git-annex used for ssh connection caching. The only code that still uses readProgramFile directly is the upgrade code, which needs to know where the standalone git-annex was installed, in order to upgrade it.
This commit is contained in:
parent
b9275b65f9
commit
450ee53ab6
14 changed files with 28 additions and 25 deletions
2
debian/changelog
vendored
2
debian/changelog
vendored
|
@ -19,6 +19,8 @@ git-annex (5.2015022) UNRELEASED; urgency=medium
|
|||
git-annex:git-annex push, as long as the remote branch
|
||||
is an ancestor of the local branch, to better support bare git repos.
|
||||
(This used to be done, but it forgot to do it since version 4.20130909.)
|
||||
* When re-execing git-annex, use current program location, rather than
|
||||
~/.config/git-annex/program, when possible.
|
||||
|
||||
-- Joey Hess <id@joeyh.name> Thu, 19 Feb 2015 14:16:03 -0400
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue