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
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
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
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
0ebde659bf
assistant: When updating ~/.ssh/config, preserve any symlinks.
2015-09-21 12:39:13 -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
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
Joey Hess
a61d37c884
analysis
2015-09-18 13:29:35 -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
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
876bc09b53
2015-09-17 14:58:27 +00: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
Jonan
92690c3cbd
Added a comment
2015-09-16 11:15:11 +00:00
Joey Hess
453c355122
comment
2015-09-15 13:38:09 -04:00
Joey Hess
b08c6d4e16
Merge branch 'master' of ssh://git-annex.branchable.com
2015-09-15 12:52:09 -04:00
Joey Hess
16947ef654
Fix bug in combination of preferred and required content settings. When one was set to the empty string and the other set to some expression, this bug caused all files to be wanted, instead of only files matching the expression.
...
Avoid: MAny `MOr` otherexpression
Which matches anything.
2015-09-15 12:50:14 -04:00
Jonan
dda36b7adf
Added a comment
2015-09-15 16:13:20 +00:00
Joey Hess
294ec009e9
comment
2015-09-15 11:59:24 -04:00
https://me.yahoo.com/a/FHnTlSBo1eCGJRwueeKeB6.RCaPbGMPr5jxx8A--#ce0d8
c4eaa5e42b
2015-09-15 11:30:09 +00:00
Jonan
82743a3dc0
2015-09-15 10:39:03 +00:00
Joey Hess
c5260f5cb0
Merge branch 'master' of ssh://git-annex.branchable.com
2015-09-13 16:04:34 -04:00
Joey Hess
54cf9c1ef3
close
2015-09-13 16:03:35 -04:00
git-annex@545634279b585e2a5818702b3c251d1ecd23da10
aea490394b
2015-09-13 17:51:26 +00:00
olivier.berger@bb28df880236e55a6bfeca92cc3de8ec424f2eba
61ca4b6ea1
Added a comment: Maybe Git 2.5 must be installed only as 32 bit ?
2015-09-11 15:42:18 +00:00
olivier.berger@bb28df880236e55a6bfeca92cc3de8ec424f2eba
fe532a6fbc
Added a comment: Not completely fixed if git not installed on C:
2015-09-11 15:31:26 +00:00
OlivierBerger
19ed545b96
Added a comment: Seems t owork now with git 2.5 for windows and daily build on windows 7
2015-09-11 11:43:43 +00:00
Joey Hess
e766dcc940
formatting
2015-09-10 19:25:01 -04:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
301090cc44
Added a comment
2015-09-10 18:44:26 +00:00
Joey Hess
bac9793362
found a fix
2015-09-10 14:21:15 -04:00
Joey Hess
369dd9a304
close
2015-09-10 13:47:31 -04:00
Joey Hess
57197b77f6
response
2015-09-10 13:46:41 -04:00
