Commit graph

15156 commits

Author SHA1 Message Date
https://www.google.com/accounts/o8/id?id=AItOawmZgZuUhZlHpd_AbbcixY0QQiutb2I7GWY
eaeae91988 2013-11-06 19:54:25 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmZgZuUhZlHpd_AbbcixY0QQiutb2I7GWY
4722fa5e7a rename bugs/GPG_errors_under_OS_10.9_Mavericks.mdwn to bugs/Mac_OS_10.9_GPG_error_adding_S3_repo.mdwn 2013-11-06 19:52:54 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmZgZuUhZlHpd_AbbcixY0QQiutb2I7GWY
e1c7dd4a95 2013-11-06 19:49:51 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmZgZuUhZlHpd_AbbcixY0QQiutb2I7GWY
3a26df0028 2013-11-06 19:47:01 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkbpbjP5j8MqWt_K4NASwv0WvB8T4rQ-pM
2946fd5ebf 2013-11-06 18:40:19 +00:00
Joey Hess
77e3f36b92 update 2013-11-06 13:08:41 -04:00
Joey Hess
b06d6b98bf update 2013-11-06 13:08:15 -04:00
Joey Hess
4f3f918abe fix merge 2013-11-06 13:03:23 -04:00
Joey Hess
00c91816fb Merge branch 'master' into directguard 2013-11-06 13:02:35 -04:00
Joey Hess
509e3bf5bb add news item for git-annex 4.20131106 2013-11-06 12:57:25 -04:00
http://joeyh.name/
2f64369444 Added a comment 2013-11-06 16:40:58 +00:00
Joey Hess
e3ade17eb0 Merge branch 'master' of ssh://git-annex.branchable.com 2013-11-06 12:39:20 -04:00
Joey Hess
81117e8a9d typo 2013-11-06 12:39:14 -04:00
http://joeyh.name/
67064c27db Added a comment 2013-11-06 16:38:48 +00:00
Joey Hess
489f2de363 Merge branch 'master' of ssh://git-annex.branchable.com 2013-11-06 12:30:05 -04:00
http://joeyh.name/
72ee3d7856 Added a comment 2013-11-06 16:27:49 +00:00
https://id.koumbit.net/anarcat
38e7feca5b lots more details and screenshots 2013-11-06 16:27:15 +00:00
Joey Hess
ee23be55fd Fix exception handling bug that could cause .git/annex/index to be used for git commits outside the git-annex branch. Known to affect git-annex when used with the git shipped with Ubuntu 13.10. 2013-11-06 12:21:50 -04:00
Joey Hess
fc82197549 Merge branch 'master' of ssh://git-annex.branchable.com 2013-11-06 11:51:58 -04:00
https://www.google.com/accounts/o8/id?id=AItOawm0v2FLGWoqzKCMg-RR2cORJ1vnj0HshXA
1ee7693119 2013-11-06 15:42:40 +00:00
Joey Hess
a74018ea98 prep release 2013-11-06 11:37:06 -04:00
https://id.koumbit.net/anarcat
79397554a3 weird permission bug in the webapp 2013-11-06 15:26:01 +00:00
Joey Hess
d9b7ea54df Merge branch 'master' of ssh://git-annex.branchable.com 2013-11-06 11:17:34 -04: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
Joey Hess
8f09cd1a93 Merge branch 'master' of ssh://git-annex.branchable.com 2013-11-06 10:51:41 -04: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
8aa22a57ca use pure or return rather than (:[]) or \x -> [x] 2013-11-06 01:18:22 -04: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
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