From 849a4b1a0d71071a602f552125fd7e25689662db Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@joeyh.name>
Date: Sat, 28 Feb 2015 17:23:13 -0400
Subject: 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.
---
 Assistant.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Assistant.hs')

diff --git a/Assistant.hs b/Assistant.hs
index eb01bb9b9..b95348604 100644
--- a/Assistant.hs
+++ b/Assistant.hs
@@ -104,7 +104,7 @@ startDaemon assistant foreground startdelay cannotrun listenhost startbrowser =
 			( liftIO $ withFile devNull WriteMode $ \nullh -> do
 				loghandle <- openLog logfile
 				e <- getEnvironment
-				cmd <- readProgramFile
+				cmd <- programPath
 				ps <- getArgs
 				(_, _, _, pid) <- createProcess (proc cmd ps)
 					{ env = Just (addEntry flag "1" e)
-- 
cgit v1.2.3