summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2015-02-28 17:23:13 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2015-02-28 17:23:13 -0400
commit849a4b1a0d71071a602f552125fd7e25689662db (patch)
tree0b78308f8616c4920d1d109c5afe00bf52492595 /debian
parenta35208c5df555006431a66436288ce156af4fdb9 (diff)
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.
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog2
1 files changed, 2 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 758a8d816..b5b545ca2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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