Commit graph

10441 commits

Author SHA1 Message Date
https://id.koumbit.net/anarcat
79397554a3 weird permission bug in the webapp 2013-11-06 15:26:01 +00:00
http://joeyh.name/
738299ab29 Added a comment 2013-11-06 15:09:20 +00:00
https://id.koumbit.net/anarcat
15678fd696 2013-11-06 15:00:13 +00:00
https://id.koumbit.net/anarcat
d429342d80 tiny little cosmetic bug 2013-11-06 14:59:04 +00:00
https://id.koumbit.net/anarcat
91663e5d2a moving discussion to a new bug report 2013-11-06 14:50:20 +00:00
https://id.koumbit.net/anarcat
d03c3ac43c file the remaining bug separately 2013-11-06 14:48:27 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkzwmw_zyMpZC9_J7ey--woeYPoZkAOgGw
6bc355ed68 Added a comment 2013-11-06 14:24:21 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnZEanlyzay_QlEAL0CWpyZcRTyN7vay8U
0047f22c59 Added a comment 2013-11-06 11:50:01 +00:00
Joey Hess
8b5de8588d point at my fork of gcrypt, which is currently needed 2013-11-05 21:28:56 -04:00
Joey Hess
39fb20631f Merge branch 'master' of ssh://git-annex.branchable.com 2013-11-05 21:26:06 -04:00
Joey Hess
a206d6fff1 devblog 2013-11-05 21:25:36 -04:00
Joey Hess
3802f2f270 work around lack of receive.denyCurrentBranch in direct mode
Now that direct mode sets core.bare=true, git's normal prohibition about
pushing into the currently checked out branch doesn't work.

A simple fix for this would be an update hook which blocks the pushes..
but git hooks must be executable, and git-annex needs to be usable on eg,
FAT, which lacks x bits.

Instead, enabling direct mode switches the branch (eg master) to a special
purpose branch (eg annex/direct/master). This branch is not pushed when
syncing; instead any changes that git annex sync commits get written to
master, and it's pushed (along with synced/master) to the remote.

Note that initialization has been changed to always call setDirect,
even if it's just setDirect False for indirect mode. This is needed because
if the user has just cloned a direct mode repo, that nothing has synced
with before, it may have no master branch, and only a annex/direct/master.
Resulting in that branch being checked out locally too. Calling setDirect False
for indirect mode moves back out of this branch, to a new master branch,
and ensures that a manual "git push" doesn't push changes directly to
the annex/direct/master of the remote. (It's possible that the user
makes a commit w/o using git-annex and pushes it, but nothing I can do
about that really.)

This commit was sponsored by Jonathan Harrington.
2013-11-05 21:08:31 -04:00
https://id.koumbit.net/anarcat
5967498e5b 2013-11-05 23:43:30 +00:00
https://id.koumbit.net/anarcat
9c2d8b9754 problem partially fixed 2013-11-05 22:05:07 +00:00
https://www.google.com/accounts/o8/id?id=AItOawne_amN4fko4p5cRY_9EYwaYuJKNn7LRio
8efdc1a067 Added a comment: feedback 2013-11-05 21:23:12 +00:00
Joey Hess
4510819215 v5 for direct mode, with automatic upgrade
This includes storing the current state of the HEAD ref, which git annex
sync is going to need, but does not make sync use it.
2013-11-05 17:05:03 -04:00
Joey Hess
0e31234e8e support direct mode repositories with core.bare=true (not yet default)
Direct mode repositories can now have core.bare=true set, to prevent
accidentally running git commands that try to operate on the work tree,
and so do the wrong thing.

This is not yet the default, and it causes known problems for git-annex sync
due to receive.denyCurrentBranch not working in bare repositories.

This commit was sponsored by Richard Hartmann.
2013-11-05 14:24:28 -04:00
http://joeyh.name/
15ad8e65f5 Added a comment 2013-11-05 18:03:27 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkzwmw_zyMpZC9_J7ey--woeYPoZkAOgGw
d69422b3d4 Added a comment 2013-11-05 17:46:02 +00:00
http://joeyh.name/
27e940a3f9 Added a comment 2013-11-05 16:46:28 +00:00
http://joeyh.name/
86f1b1216f Added a comment 2013-11-05 16:43:26 +00:00
Joey Hess
2eeb54a107 Merge branch 'master' of ssh://git-annex.branchable.com 2013-11-05 12:39:50 -04:00
Joey Hess
564da7946c fixed long ago 2013-11-05 12:32:09 -04:00
http://joeyh.name/
aa51b7cd61 Added a comment 2013-11-05 16:17:22 +00:00
http://joeyh.name/
4cbe558073 Added a comment 2013-11-05 16:14:34 +00:00
http://joeyh.name/
71116f064b Added a comment 2013-11-05 16:01:15 +00:00
Joey Hess
6a0a3d715c dup 2013-11-05 11:58:18 -04:00
https://id.koumbit.net/anarcat
b20389dddb Added a comment: awesome! 2013-11-05 15:50:16 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkzwmw_zyMpZC9_J7ey--woeYPoZkAOgGw
51b36fbb20 2013-11-05 15:20:35 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmNu4V5fvpLlBhaCUfXXOB0MI5NXwh8SkU
5569b7b7f5 2013-11-05 11:36:28 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmNu4V5fvpLlBhaCUfXXOB0MI5NXwh8SkU
45992b36c2 2013-11-05 11:10:15 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkwQdSwD0JLNQHcQoUVLT-ZwaRKq-b0om8
136b030642 pubdate should be added to importfeed's templating. 2013-11-05 04:21:46 +00:00
https://id.koumbit.net/anarcat
25430cb8e1 hmm... maybe related to another SNAFU bug i filed... 2013-11-05 04:10:26 +00:00
https://id.koumbit.net/anarcat
3af8d545b1 just followed the "file a bug" link in the webapp here :) 2013-11-05 04:05:40 +00:00
tanen
904c9e972d 2013-11-04 22:50:51 +00:00
tanen
4e63cc16c4 2013-11-04 22:49:38 +00:00
Joey Hess
2e3b4469e3 Merge branch 'master' of ssh://git-annex.branchable.com 2013-11-04 17:32:03 -04:00
Joey Hess
78449ed2ae devblog 2013-11-04 17:30:53 -04:00
https://www.google.com/accounts/o8/id?id=AItOawne_amN4fko4p5cRY_9EYwaYuJKNn7LRio
506cadbcfb 2013-11-04 21:04:16 +00:00
https://www.google.com/accounts/o8/id?id=AItOawne_amN4fko4p5cRY_9EYwaYuJKNn7LRio
33e8e85bb4 2013-11-04 20:40:19 +00:00
https://www.google.com/accounts/o8/id?id=AItOawne_amN4fko4p5cRY_9EYwaYuJKNn7LRio
5c8bb8d021 2013-11-04 20:35:23 +00:00
http://joeyh.name/
f2926d2885 Added a comment 2013-11-04 19:14:04 +00:00
Joey Hess
07ba5a6991 Merge branch 'master' of ssh://git-annex.branchable.com 2013-11-04 15:09:42 -04:00
Joey Hess
c990cf815b improvements; recommend sync after copy 2013-11-04 15:07:06 -04:00
https://www.google.com/accounts/o8/id?id=AItOawkbpbjP5j8MqWt_K4NASwv0WvB8T4rQ-pM
49cf918de8 Added a comment 2013-11-04 18:54:55 +00:00
Joey Hess
a0cb927a76 Merge branch 'master' of ssh://git-annex.branchable.com 2013-11-04 14:35:36 -04:00
Joey Hess
70f3f22d8c some thoughts for madduck 2013-11-04 14:34:34 -04:00
tanen
26b4e5af3e Added a comment 2013-11-04 17:58:36 +00:00
http://joeyh.name/
d0a48ac2da Added a comment 2013-11-04 17:12:05 +00:00
http://joeyh.name/
082e652a36 Added a comment 2013-11-04 17:07:56 +00:00
https://www.google.com/accounts/o8/id?id=AItOawk9nck8WX8-ADF3Fdh5vFo4Qrw1I_bJcR8
e8641876a2 2013-11-04 11:55:35 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkbpbjP5j8MqWt_K4NASwv0WvB8T4rQ-pM
f706c4ada8 Added a comment 2013-11-04 10:31:56 +00:00
Rasmus
5bc1136ee4 2013-11-04 09:57:34 +00:00
tanen
90845210c7 Added a comment 2013-11-04 09:01:13 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkbpbjP5j8MqWt_K4NASwv0WvB8T4rQ-pM
88661c8e14 Added a comment 2013-11-04 07:39:22 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmNu4V5fvpLlBhaCUfXXOB0MI5NXwh8SkU
5e9021574f Added a comment 2013-11-04 04:40:53 +00:00
tanen
d67480ad19 Added a comment 2013-11-03 22:35:08 +00:00
http://joeyh.name/
c49354b4bf Added a comment 2013-11-03 19:57:25 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmTlfbCC37CAjhQrS107ZWRVA_sF4s3gLU
b71738143d 2013-11-03 19:18:06 +00:00
tanen
e3b7682729 Added a comment 2013-11-03 17:35:01 +00:00
http://joeyh.name/
df7ad73467 Added a comment 2013-11-03 17:02:48 +00:00
http://joeyh.name/
c6b0272b1a Added a comment 2013-11-03 16:48:26 +00:00
tanen
b50debbd26 2013-11-03 14:50:52 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkzwmw_zyMpZC9_J7ey--woeYPoZkAOgGw
5a24f1c044 Added a comment 2013-11-03 13:10:12 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkbpbjP5j8MqWt_K4NASwv0WvB8T4rQ-pM
ab65926f8e Added a comment 2013-11-03 11:24:28 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnZEanlyzay_QlEAL0CWpyZcRTyN7vay8U
3604152376 removed 2013-11-03 09:50:58 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnZEanlyzay_QlEAL0CWpyZcRTyN7vay8U
b37f2fe296 Added a comment 2013-11-03 09:49:17 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnZEanlyzay_QlEAL0CWpyZcRTyN7vay8U
e5ce108680 Added a comment 2013-11-03 09:48:53 +00:00
Joey Hess
51b913760d expand on wheezy backport 2013-11-02 22:57:44 -04:00
http://joeyh.name/
baecb87e73 Added a comment 2013-11-03 02:33:14 +00:00
http://joeyh.name/
4d2f0eb553 Added a comment 2013-11-03 02:32:47 +00:00
Joey Hess
a2699b1b57 Merge branch 'master' of ssh://git-annex.branchable.com 2013-11-02 22:26:05 -04:00
Joey Hess
1f39aef893 Fix zombie process that occurred when switching between repository views in the webapp. 2013-11-02 22:25:08 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmNu4V5fvpLlBhaCUfXXOB0MI5NXwh8SkU
3567918aa5 Added a comment 2013-11-03 02:19:04 +00:00
http://joeyh.name/
47a04ce8e5 Added a comment 2013-11-03 01:52:56 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmNu4V5fvpLlBhaCUfXXOB0MI5NXwh8SkU
6c3aa97124 Added a comment 2013-11-03 01:35:32 +00:00
http://joeyh.name/
058702239b Added a comment 2013-11-03 01:31:27 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmNu4V5fvpLlBhaCUfXXOB0MI5NXwh8SkU
e3c91c2c54 Added a comment 2013-11-03 01:19:42 +00:00
http://joeyh.name/
1c808f6331 Added a comment 2013-11-03 01:17:39 +00:00
http://joeyh.name/
d82330be81 removed 2013-11-03 01:15:09 +00:00
http://joeyh.name/
fe86a508e2 removed 2013-11-03 01:14:40 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmNu4V5fvpLlBhaCUfXXOB0MI5NXwh8SkU
89796b67ed Added a comment 2013-11-03 01:13:27 +00:00
http://joeyh.name/
0a063f7cde Added a comment 2013-11-03 01:12:25 +00:00
http://joeyh.name/
62a69bb08e Added a comment 2013-11-03 01:09:16 +00:00
Joey Hess
a83dca0a58 Merge branch 'master' of ssh://git-annex.branchable.com 2013-11-02 21:08:26 -04:00
Joey Hess
230409441c Merge branch 'master' of ssh://git-annex.branchable.com 2013-11-02 21:07:32 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmNu4V5fvpLlBhaCUfXXOB0MI5NXwh8SkU
58fe6746ed Added a comment 2013-11-03 01:07:31 +00:00
http://joeyh.name/
86bdab72b1 Added a comment 2013-11-03 00:50:48 +00:00
Joey Hess
c2b979c550 respond 2013-11-02 20:48:41 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmNu4V5fvpLlBhaCUfXXOB0MI5NXwh8SkU
9238d9e85d 2013-11-03 00:45:32 +00:00
http://joeyh.name/
884b66ca77 Added a comment 2013-11-03 00:45:10 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmNu4V5fvpLlBhaCUfXXOB0MI5NXwh8SkU
e2d74ed470 Added a comment 2013-11-03 00:39:48 +00:00
http://joeyh.name/
1f82232ea4 Added a comment 2013-11-03 00:29:15 +00:00
Joey Hess
5fd398ed72 did I really just get feedback on a docuentation page I thought nobody would ever read?! 2013-11-02 20:25:42 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmNu4V5fvpLlBhaCUfXXOB0MI5NXwh8SkU
6c9d390453 Added a comment: config from backup repo 2013-11-03 00:20:11 +00:00
http://joeyh.name/
7c85dd6768 Added a comment 2013-11-03 00:19:35 +00:00
Joey Hess
d4e62f846c fixed 2013-11-02 20:16:28 -04:00
Joey Hess
e1a24974f1 Merge branch 'master' of ssh://git-annex.branchable.com 2013-11-02 20:16:11 -04:00
http://joeyh.name/
48d5e0fecc Added a comment 2013-11-03 00:15:30 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmWBvsZvSsAL8P2ye3F0OBStjFCVnOImzM
22e7b711c1 2013-11-03 00:14:25 +00:00