mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions
15051 commits 13 branches 455 tags 157 MiB
Commit graph

587 commits

Author SHA1 Message Date
Joey Hess
4f373503f2 sync: When there are merge conflicts that get automatically resolved, exit nonzero at the end. 2013-11-07 15:02:11 -04:00
Joey Hess
d99bdbbb84 Merge branch 'directguard' 2013-11-07 14:12:13 -04:00
https://www.google.com/accounts/o8/id?id=AItOawkkyBDsfOB7JZvPZ4a8F3rwv0wk6Nb9n48
5e1a5ff508 2013-11-07 11:22:50 +00:00
Joey Hess
00c91816fb Merge branch 'master' into directguard 2013-11-06 13:02:35 -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://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
http://joeyh.name/
27e940a3f9 Added a comment 2013-11-05 16:46:28 +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
33e8e85bb4 2013-11-04 20:40:19 +00:00
https://www.google.com/accounts/o8/id?id=AItOawk9nck8WX8-ADF3Fdh5vFo4Qrw1I_bJcR8
e8641876a2 2013-11-04 11:55:35 +00:00
Joey Hess
230409441c Merge branch 'master' of ssh://git-annex.branchable.com 2013-11-02 21:07:32 -04:00
Joey Hess
c2b979c550 respond 2013-11-02 20:48:41 -04:00
http://joeyh.name/
7c85dd6768 Added a comment 2013-11-03 00:19:35 +00:00
Joey Hess
e1a24974f1 Merge branch 'master' of ssh://git-annex.branchable.com 2013-11-02 20:16:11 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmNu4V5fvpLlBhaCUfXXOB0MI5NXwh8SkU
fcc68d3e32 Added a comment 2013-11-02 23:59:16 +00:00
http://joeyh.name/
5bb89b28eb Added a comment 2013-11-02 23:45:39 +00:00
Joey Hess
1de5eb4c81 respond 2013-11-02 19:44:03 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmNu4V5fvpLlBhaCUfXXOB0MI5NXwh8SkU
081ce0b4f7 2013-11-02 23:14:49 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmNu4V5fvpLlBhaCUfXXOB0MI5NXwh8SkU
f3cc842390 2013-11-02 23:12:29 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmNu4V5fvpLlBhaCUfXXOB0MI5NXwh8SkU
26ff2f95e9 2013-11-02 23:05:33 +00:00
Joey Hess
768c323e74 add 2013-11-02 16:48:37 -04:00
https://www.google.com/accounts/o8/id?id=AItOawnWwEEA3CurHkBjIYaJsJzFc4jtY2SCkrQ
c4e7b2a4d4 Added a comment 2013-10-29 00:29:03 +00:00
Joey Hess
230bfa9688 add --want-get and --want-drop options 
New --want-get and --want-drop options which can be used to test preferred
content settings. For example, "git annex find --in . --want-drop"
 2013-10-28 14:50:17 -04:00
http://joeyh.name/
66c094a251 Added a comment 2013-10-28 17:11:05 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnWwEEA3CurHkBjIYaJsJzFc4jtY2SCkrQ
d245201e6d 2013-10-28 08:38:06 +00:00
lorenzo
ca77441eeb removed 2013-10-27 23:56:44 +00:00
lorenzo
3ab515722d Added a comment: Running Debian squeeze binaries on libc 2.5 based NAS 2013-10-27 23:56:26 +00:00
lorenzo
3cc3692d3d Added a comment: Running Debian squeeze binaries on libc 2.5 based NAS 2013-10-27 23:55:06 +00:00
Joey Hess
2a872dc576 thought 2013-10-26 15:58:02 -04:00
Joey Hess
9bca19052c move wishlist todo from forum 2013-10-26 15:56:14 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmVE2R20dyfPQIzdi6urVUUAXtD6eeBsr0
919e1f48db Added a comment 2013-10-19 15:43:36 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmVE2R20dyfPQIzdi6urVUUAXtD6eeBsr0
0e75b69fd8 removed 2013-10-19 15:43:22 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmVE2R20dyfPQIzdi6urVUUAXtD6eeBsr0
c74cb9b352 Added a comment 2013-10-19 15:39:52 +00:00
http://joeyh.name/
9d318b655b Added a comment 2013-10-19 15:33:18 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmVE2R20dyfPQIzdi6urVUUAXtD6eeBsr0
0b1ed85008 2013-10-19 15:13:14 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlhE8Xar6m4x3JSILXdm-Y5KhwHTH5qzKQ
a20f7eecdd Added a comment: +1 2013-10-14 14:43:11 +00:00
GLITTAH
d8e5a7cf64 2013-10-13 23:07:25 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnpdM9F8VbtQ_H5PaPMpGSxPe_d5L1eJ6w
fa969371a3 Added a comment 2013-10-07 13:33:41 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnpdM9F8VbtQ_H5PaPMpGSxPe_d5L1eJ6w
3db1985a01 Added a comment 2013-10-05 10:45:16 +00:00
http://joeyh.name/
71dba0187a Added a comment 2013-10-04 20:50:34 +00:00
http://joeyh.name/
1537c21eb0 Added a comment 2013-10-04 20:17:07 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnpdM9F8VbtQ_H5PaPMpGSxPe_d5L1eJ6w
13f776140d 2013-10-04 14:41:05 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnpdM9F8VbtQ_H5PaPMpGSxPe_d5L1eJ6w
f0ec3d355a 2013-10-04 14:39:15 +00:00
http://cstork.org/
c5ef652a4d Added a comment: How should this interact with the trust model and location tracking? 2013-10-04 11:13:11 +00:00
Joey Hess
6b37fcffd8 assistant: More robust inotify handling; avoid crashing if a directory cannot be read. 2013-09-30 13:11:26 -04:00
https://www.google.com/accounts/o8/id?id=AItOawl-g0hYpGY11pBP_42lHh5GWTyFuB4UwH8
7a6c7acb51 Added a comment 2013-09-25 23:08:56 +00:00
Joey Hess
5ff9224b10 Merge branch 'master' of ssh://git-annex.branchable.com 2013-09-25 15:30:45 -04:00
http://joeyh.name/
f30b4f7208 Added a comment 2013-09-25 18:47:13 +00:00