Commit graph

23194 commits

Author SHA1 Message Date
Joey Hess
450ee53ab6 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.
2015-02-28 17:23:13 -04:00
Joey Hess
b9275b65f9 make programPath return FilePath not Maybe FilePath
Looking at the few current callers, it's ok to have programPath throw an
exception, in the unusual case where it cannot find git-annex.
2015-02-28 16:59:52 -04:00
Régis
2297a771f4 Added a comment 2015-02-28 18:33:27 +00:00
https://www.google.com/accounts/o8/id?id=AItOawn9oPAaWcO-ZwHKOW1hQ0-8zG-KguSJln0
fd01a1c0d8 2015-02-28 12:37:31 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnbPKLjBONawBd74MKJZo05juCqdsP1jAU
0f72b848cf Added a comment 2015-02-27 22:06:52 +00:00
Régis
c2928e3c48 Added a comment 2015-02-27 21:38:06 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnbPKLjBONawBd74MKJZo05juCqdsP1jAU
02fcfe70ac 2015-02-27 20:16:04 +00:00
Joey Hess
ad1f4a7f1c followu 2015-02-27 16:06:57 -04:00
Joey Hess
7ddebebea8 think I found a way to support submodules 2015-02-27 15:58:01 -04:00
Joey Hess
fdc6f7904a respinse 2015-02-27 15:01:29 -04:00
Joey Hess
6793dfb0d7 response 2015-02-27 14:56:47 -04:00
Joey Hess
289881bdb8 sync: As well as the synced/git-annex push, attempt a git-annex:git-annex push, as long as the remote branch is an ancestor of the local branch, to better support bare git repos.
See my comment in the bug report for analysis; basically this is safe
because it's a non-forced push, so won't lose history. Even if it was a
forced push or somehow races, things will eventually become consistent and
no git-annex branch info will be lost.

(This used to be done, but it forgot to do it since version 4.20130909.)
2015-02-27 14:49:56 -04:00
Régis
1082b1dbdb 2015-02-27 17:34:05 +00:00
Joey Hess
db2b96d301 Merge branch 'master' of ssh://git-annex.branchable.com 2015-02-27 11:16:44 -04:00
Joey Hess
8914773c05 move resourcet dependency out of S3 only; needed by database code 2015-02-27 11:15:09 -04:00
BojanNikolic
8a78ab4873 Added a comment 2015-02-27 09:55:16 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnbPKLjBONawBd74MKJZo05juCqdsP1jAU
6cd08c7246 Added a comment 2015-02-27 01:43:42 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnbPKLjBONawBd74MKJZo05juCqdsP1jAU
b362ecfd65 removed 2015-02-27 01:42:28 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnbPKLjBONawBd74MKJZo05juCqdsP1jAU
baba042cc3 Added a comment 2015-02-27 01:41:15 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnbPKLjBONawBd74MKJZo05juCqdsP1jAU
8718bf3415 removed 2015-02-27 01:40:01 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnbPKLjBONawBd74MKJZo05juCqdsP1jAU
07419b9a22 Added a comment 2015-02-27 01:38:36 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnbPKLjBONawBd74MKJZo05juCqdsP1jAU
9c72d37efb removed 2015-02-26 23:57:35 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnbPKLjBONawBd74MKJZo05juCqdsP1jAU
bc5bc237c5 removed 2015-02-26 23:55:35 +00:00
https://id.koumbit.net/anarcat
f49bb3c914 Added a comment 2015-02-26 23:53:32 +00:00
https://id.koumbit.net/anarcat
14e0fb78fd Added a comment 2015-02-26 23:52:52 +00:00
https://id.koumbit.net/anarcat
0bee02beaa i think i figured out some weird bug... hopefully? :) 2015-02-26 23:46:52 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnbPKLjBONawBd74MKJZo05juCqdsP1jAU
6645d374da Added a comment 2015-02-26 23:44:40 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnbPKLjBONawBd74MKJZo05juCqdsP1jAU
bddfae9334 Added a comment 2015-02-26 18:47:48 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnbPKLjBONawBd74MKJZo05juCqdsP1jAU
f13be11ec2 Added a comment 2015-02-26 18:21:03 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnb2yfWzJ2lYQw1UTm6XVZ4y8qashNagZA
adcdfedaed Added a comment: Re: comment1 2015-02-26 12:48:56 +00:00
https://www.google.com/accounts/o8/id?id=AItOawk7iPiqWr3BVPLWEDvJhSSvcOqheLEbLNo
450bcc0a54 Added a comment: Is the Mavericks build still beeing updated? 2015-02-26 12:22:52 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnbPKLjBONawBd74MKJZo05juCqdsP1jAU
296b977761 2015-02-26 09:37:51 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnbPKLjBONawBd74MKJZo05juCqdsP1jAU
fb63408b95 2015-02-26 09:33:57 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnbPKLjBONawBd74MKJZo05juCqdsP1jAU
184f433f46 Added a comment 2015-02-26 08:08:37 +00:00
Joey Hess
f25ec60c37 comment 2015-02-25 16:31:20 -04:00
Joey Hess
76cde095fe Linux standalone: Set LOCPATH=/dev/null to work around https://ghc.haskell.org/trac/ghc/ticket/7695
This prevents localization from working, but git-annex is not localized anyway.
2015-02-25 16:31:01 -04:00
Joey Hess
022461d773 add a link 2015-02-25 15:49:18 -04:00
Joey Hess
8466992a9b comment 2015-02-25 15:45:15 -04:00
Joey Hess
e4f17ef39d fix doc problem noticed in a forum question 2015-02-25 15:41:55 -04:00
Joey Hess
49c007f6e7 comment 2015-02-25 15:24:53 -04:00
Joey Hess
aac96fe082 Merge branch 'master' of ssh://git-annex.branchable.com 2015-02-25 15:21:28 -04:00
Joey Hess
a69a79498f retitle 2015-02-25 15:21:05 -04:00
Joey Hess
58161fb0af response 2015-02-25 15:20:11 -04:00
Joey Hess
ca663e867f followup 2015-02-25 15:17:42 -04:00
Joey Hess
68725d27e5 wording 2015-02-25 14:31:17 -04:00
Joey Hess
c05f8b3c66 close; git annex list is the command you seek 2015-02-25 14:30:59 -04:00
https://www.google.com/accounts/o8/id?id=AItOawlEXDOqKvKFW9zl1DY5U9ofpXpeDRf6eN4
06de7f0c68 Added a comment 2015-02-25 18:28:49 +00:00
Joey Hess
f09a3a89c1 comment 2015-02-25 14:27:04 -04:00
Joey Hess
e197ef653f comment 2015-02-25 14:19:13 -04:00
Joey Hess
a35cd6cdf7 comment 2015-02-25 14:17:03 -04:00