Commit graph

15072 commits

Author SHA1 Message Date
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
Joey Hess
cf34e59c8c factor out update 2013-11-05 18:20:52 -04: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
04768e44b2 automatically set and unset core.bare when switching to/from direct mode 2013-11-05 15:41:24 -04:00
Joey Hess
0edd9ec03a refactored hook setup 2013-11-05 15:29:56 -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
Joey Hess
c2862d9585 pass -c option on to all git commands run
The -c option now not only modifies the git configuration seen by
git-annex, but it is passed along to every git command git-annex runs.

This was easy to plumb through because gitCommandLine is already used to
construct every git command line, to add --git-dir and --work-tree
2013-11-05 13:38:37 -04: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
dfe3162bf5 fix editing unknown uuid
Before, assumed Nothing when getting remote meant it was the local repo,
and showed the edit form for that.
2013-11-05 12:38:54 -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
Joey Hess
58db042033 map: Work when there are gcrypt remotes. 2013-11-04 14:14:44 -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
Joey Hess
832598d1d9 Merge branch 'master' of ssh://git-annex.branchable.com 2013-11-04 13:01:18 -04: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