Commit graph

915 commits

Author SHA1 Message Date
Joey Hess
052be10884 Merge branch 'master' of ssh://git-annex.branchable.com 2012-10-22 12:19:35 -04:00
Joey Hess
b05981d973 uninit: Check and abort if there are symlinks to annexed content that are not checked into git. 2012-10-22 11:54:50 -04:00
Joey Hess
12efabf070 webapp: Allow dashes in ssh key comments when pairing. 2012-10-22 11:18:19 -04:00
http://joeyh.name/
d130bd41e1 Added a comment 2012-10-22 14:01:42 +00:00
http://joeyh.name/
73533538ac Added a comment 2012-10-22 13:53:06 +00:00
https://me.yahoo.com/a/2grhJvAC049fJnvALDXek.6MRZMTlg--#eec89
5c42e0d381 2012-10-22 02:07:02 +00:00
http://a-or-b.myopenid.com/
e1d0c7813b 2012-10-21 06:16:36 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnq-RfkVpFN15SWvQ2lpSGAi0XpNQuLxKM
af3cee511c 2012-10-20 15:22:54 +00:00
https://me.yahoo.com/a/2grhJvAC049fJnvALDXek.6MRZMTlg--#eec89
2f319e8aba Added a comment: Correction 2012-10-20 05:34:47 +00:00
https://me.yahoo.com/a/2grhJvAC049fJnvALDXek.6MRZMTlg--#eec89
acff478d3b 2012-10-20 05:31:45 +00:00
Joey Hess
4d1e0c9be8 Merge branch 'master' of ssh://git-annex.branchable.com 2012-10-19 17:03:07 -04:00
http://joeyh.name/
09da058873 Added a comment 2012-10-19 21:01:44 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkoMFuxYLuZXXOEh4uGzSAD8otbDxW5r94
e8f8dbe752 2012-10-19 17:47:17 +00:00
Joey Hess
6fab0e9c15 Merge branch 'master' of ssh://git-annex.branchable.com 2012-10-19 13:10:53 -04:00
Joey Hess
84f3691932 close 2012-10-19 13:10:32 -04:00
http://grossmeier.net/
c3d48bfa3e 2012-10-19 05:34:11 +00:00
https://me.yahoo.com/a/2grhJvAC049fJnvALDXek.6MRZMTlg--#eec89
5851556836 Added a comment: I agree 2012-10-18 07:11:20 +00:00
https://me.yahoo.com/a/2grhJvAC049fJnvALDXek.6MRZMTlg--#eec89
10d27267aa Added a comment: Works great! 2012-10-18 05:34:06 +00:00
http://joeyh.name/
91b64deceb Added a comment 2012-10-18 02:04:47 +00:00
https://me.yahoo.com/a/2grhJvAC049fJnvALDXek.6MRZMTlg--#eec89
0009f4e140 Added a comment: Doesn't quite work 2012-10-17 22:23:16 +00:00
https://me.yahoo.com/a/2grhJvAC049fJnvALDXek.6MRZMTlg--#eec89
8b025c59a5 Added a comment: uname on OpenIndiana 2012-10-17 22:19:04 +00:00
http://joeyh.name/
d78d5b596a Added a comment 2012-10-17 18:29:24 +00:00
http://joeyh.name/
19371138cc Added a comment 2012-10-17 17:42:30 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkywesyg6tKBZcmxJ2EMUO89DZL1LZ7Sng
4b3e0c6537 Added a comment 2012-10-17 11:41:54 +00:00
https://me.yahoo.com/a/2grhJvAC049fJnvALDXek.6MRZMTlg--#eec89
355c2cbab4 2012-10-17 07:21:36 +00:00
Joey Hess
ccf76ec29d close 2012-10-16 21:07:58 -04:00
http://joeyh.name/
fbb394daeb Added a comment 2012-10-17 01:07:00 +00:00
http://joeyh.name/
a70e92b8e4 Added a comment 2012-10-17 00:41:03 +00:00
https://me.yahoo.com/a/2grhJvAC049fJnvALDXek.6MRZMTlg--#eec89
e2335c6688 2012-10-17 00:14:34 +00:00
http://joeyh.name/
549204c8a4 Added a comment 2012-10-16 20:28:04 +00:00
Joey Hess
5af5e50475 fixed 2012-10-16 12:34:22 -04:00
https://www.google.com/accounts/o8/id?id=AItOawkywesyg6tKBZcmxJ2EMUO89DZL1LZ7Sng
148f7ee1f3 Added a comment 2012-10-16 12:02:27 +00:00
EskildHustvedt
e9387aee5c 2012-10-16 07:58:45 +00:00
http://joeyh.name/
70a15660de Added a comment 2012-10-16 05:56:10 +00:00
https://me.yahoo.com/a/2grhJvAC049fJnvALDXek.6MRZMTlg--#eec89
8837dfec6d Added a comment: I can confirm the fix 2012-10-16 05:53:15 +00:00
Joey Hess
8fec62d299 A relative core.worktree is relative to the gitdir.
Now that this is handled correctly, git-annex can be used in git submodules.

Also, fixed infelicity where Git.CurrentRepo and Git.Config.updateLocation
were both dealing with core.worktree. Now updateLocation handles it for
Local as well as for LocalUnknown repos.
2012-10-16 00:08:39 -04:00
Joey Hess
d430fb1153 Bug fix: A recent change caused git-annex-shell to crash. 2012-10-15 22:22:40 -04:00
https://me.yahoo.com/a/2grhJvAC049fJnvALDXek.6MRZMTlg--#eec89
dd1e68ea00 2012-10-16 00:12:54 +00:00
Joey Hess
3156febec8 disable ssh connection caching for standalone builds
The standalone build does not bundle its own ssh, so should be built
to support as wide an array of ssh versions as possible, so turn off
connection caching.

Unfortunatly, as implemented this forces a full rebuild when building the
standalone binary, and of course it makes it somewhat slower.

This is not ideal, but neither is probing the ssh version every time it's
run (slow), or once when initializing a repo (fragile).
2012-10-15 14:49:40 -04:00
http://joeyh.name/
147c07c84e Added a comment 2012-10-15 18:16:58 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkywesyg6tKBZcmxJ2EMUO89DZL1LZ7Sng
95ba1d82bc 2012-10-15 13:36:15 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmmPHsszTlpa3s3x_LEzmEYkZfEmqq7IjU
bdf2d6eb74 2012-10-15 01:18:41 +00:00
Joey Hess
4571ad9590 add help command 2012-10-13 19:07:56 -04:00
https://www.google.com/accounts/o8/id?id=AItOawnhzb9AQj5y4pUFlksrUIQ1z9AO1BcuZMw
d00ec669d6 2012-10-13 22:23:46 +00:00
Joey Hess
e05c21cb73 Fix a crash when merging files in the git-annex branch that contain invalid utf8.
The crash actually occurred when writing out the file, which was done to a
handle that had not had fileSystemEncoding applied to it.
2012-10-12 12:19:30 -04:00
Joey Hess
97ea08e2d1 Avoid unsetting HOME when running certian git commands. Closes: #690193
Setting GIT_INDEX_FILE clobbers the rest of the environment, making git
not read ~/.gitconfig, and blow up if GECOS didn't have a name for the
user.

I'm not entirely happy with getEnvironment being run every time now,
that's somewhat expensive. It may make sense to just set GIT_COMMITTER_*
and GIT_AUTHOR_*, but I worry that clobbering the rest could break PATH,
or GIT_PATH, or something else that might be used by a command run in here.
And caching the environment is not a good idea either; it can change..
2012-10-11 12:58:24 -04:00
Joey Hess
888981eaae update; branch 2012-10-07 23:10:28 -04:00
Joey Hess
094dfac9f2 note 2012-10-05 10:57:34 -04:00
Joey Hess
f84ac8141e old bug 2012-10-04 20:15:16 -04:00
Joey Hess
47314c0fad fix last zombies in the assistant
Made Git.LsFiles return cleanup actions, and everything waits on
processes now, except of course for Seek.
2012-10-04 19:56:32 -04:00