Joey Hess
dc2f1f09b7
Improve robustness of direct mode merge, avoiding a crash if the index file is missing.
...
I couldn't find a good way to make an *empty* index file (zero byte file
won't do), so I punted and just don't make index.lock when there's no index
yet. This means some other git process could race and write an index file
at the same time as the merge is ongoing, in theory. Only happens in new
repos though.
2015-09-22 13:00:18 -04:00
Joey Hess
84f07eb947
split index mode
2015-09-22 12:52:46 -04:00
Joey Hess
017c00c581
redundant import
2015-09-22 12:31:54 -04:00
Joey Hess
ad0df9bf25
impossible to implement this w/o breaking desired behavior
2015-09-22 12:10:34 -04:00
Joey Hess
1dcb86498e
Improve ~/.ssh/config modification code to not add trailing spaces to lines it cannot parse.
...
"Host\n" is a valid line, and actually gets parsed ok, but this also holds
for other lines that it fails to parse for some reason.
2015-09-22 12:06:10 -04:00
Joey Hess
927498a1e4
Merge branch 'master' of ssh://git-annex.branchable.com
2015-09-22 11:59:06 -04:00
Joey Hess
367a79b82c
comment
2015-09-22 11:58:39 -04:00
Joey Hess
ae0cb34795
no reproduce
2015-09-22 11:57:45 -04:00
Joey Hess
f33e760aab
Merge branch 's3-classes'
2015-09-22 11:05:53 -04:00
Joey Hess
20205b6073
avoid hard dependency on new version of aws
2015-09-22 11:04:26 -04:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
bf60d58962
Added a comment: how to get access to urls needing authentication without private info in the url
2015-09-22 14:05:45 +00:00
https://mathstuf.id.fedoraproject.org/
58706afb58
Added a comment
2015-09-21 21:24:26 +00:00
spwhitton
7d3eb6d47d
Added a comment
2015-09-21 21:22:22 +00:00
Joey Hess
c8747b1607
followup
2015-09-21 16:49:10 -04:00
Joey Hess
69b856a38a
Merge branch 'master' of ssh://git-annex.branchable.com
2015-09-21 16:22:32 -04:00
Joey Hess
399f8cf649
response
2015-09-21 15:35:13 -04:00
Joey Hess
b4cdd8fdb5
followup more
2015-09-21 15:27:36 -04:00
Joey Hess
fe10b876cd
cannot reproduce
2015-09-21 15:17:47 -04:00
Joey Hess
9cf43fb7b4
followu
2015-09-21 15:02:53 -04:00
https://mathstuf.id.fedoraproject.org/
0f62c68000
Added a comment
2015-09-21 18:27:07 +00:00
Joey Hess
5170e6ac1a
forwarded bug
2015-09-21 13:29:59 -04:00
Joey Hess
3058e11520
webapp: Remove the "disable remote" feature from the UI.
...
It's confusing, easy to select by accident and get into a situation the
webapp offers no easy recovery from, and pausing syncing works just as well
in most situations.
2015-09-21 13:05:44 -04:00
Joey Hess
d3af2bd64f
response
2015-09-21 12:54:16 -04:00
Joey Hess
0bf431745d
response
2015-09-21 12:47:43 -04:00
Joey Hess
d1949b6e5f
response
2015-09-21 12:41:41 -04:00
Joey Hess
0ebde659bf
assistant: When updating ~/.ssh/config, preserve any symlinks.
2015-09-21 12:39:13 -04:00
Joey Hess
c6041164e4
response
2015-09-21 12:13:33 -04:00
Joey Hess
96da291934
reopen, comment
2015-09-21 12:10:59 -04:00
stoile@3a237e0cf1bb7ab671df438ff759e0448189419d
e95dca349b
Added a comment: This might still be a git-annex bug
2015-09-21 15:09:09 +00:00
http://svario.it/gioele
87bb722136
2015-09-20 09:59:20 +00:00
https://mathstuf.id.fedoraproject.org/
3b5691c95f
2015-09-19 15:04:59 +00:00
https://mathstuf.id.fedoraproject.org/
0e6c463cef
2015-09-19 15:03:50 +00:00
jm_taylor@342a0022334070c40df7ec77799ce46a2d8d3f15
87d7a0abbc
2015-09-19 12:12:00 +00:00
Joey Hess
a61d37c884
analysis
2015-09-18 13:29:35 -04:00
Joey Hess
30e350d7ff
comment
2015-09-18 12:55:20 -04:00
Joey Hess
694c7ad3f7
comment
2015-09-18 12:45:51 -04:00
Joey Hess
bdfa24ef80
cloe
2015-09-18 12:27:04 -04:00
Joey Hess
ce72e1af2d
Merge branch 'master' of ssh://git-annex.branchable.com
2015-09-17 17:20:51 -04:00
Joey Hess
26d6566307
S3 storage classes expansion
...
Added support for storageclass=STANDARD_IA to use Amazon's
new Infrequently Accessed storage.
Also allows using storageclass=NEARLINE to use Google's NearLine storage.
The necessary changes to aws to support this are in
https://github.com/aristidb/aws/pull/176
2015-09-17 17:20:01 -04:00
Joey Hess
89238e9595
juggle dup bugs
2015-09-17 17:08:39 -04:00
Joey Hess
1e3100017e
close as dup
2015-09-17 15:29:26 -04:00
Joey Hess
04ffee811a
response
2015-09-17 13:03:19 -04:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
876bc09b53
2015-09-17 14:58:27 +00:00
Joey Hess
0e04920aa0
interlink
2015-09-17 09:39:20 -04:00
Joey Hess
bf0a9d03c6
delayed devblog
2015-09-16 23:36:10 -04:00
Joey Hess
1fb24c4627
mini time machine fix
2015-09-16 14:27:49 -04:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
79661ef64f
2015-09-16 16:33:55 +00:00
Joey Hess
9e48c04d15
info: Don't allow use in a non-git-annex repository, since it uses the git-annex branch and would create it if it were missing.
...
I made the change to allow in 2014 without any rationalle or associated
request that I can find.
2015-09-16 12:25:43 -04:00
Joey Hess
f8ff39ccf5
Merge branch 'newwinrelease'
2015-09-16 12:00:01 -04:00
Joey Hess
a20095c3b3
add news item for git-annex 5.20150916
2015-09-16 10:56:37 -04:00
