Commit graph

29824 commits

Author SHA1 Message Date
lasitus
fb356bd39c Added a comment 2017-02-15 02:17:25 +00:00
lasitus
aec64ce496 removed 2017-02-15 02:14:05 +00:00
lasitus
5227da6d8a Added a comment 2017-02-15 02:13:25 +00:00
Joey Hess
9fe402187e
Merge branch 'master' of ssh://git-annex.branchable.com 2017-02-14 17:42:25 -04:00
Joey Hess
e8b9565b6f
thoughts 2017-02-14 17:39:37 -04:00
db48x
1f7b8373cc Added a comment 2017-02-14 21:10:13 +00:00
https://me.yahoo.com/a/80VlVB0Bx9TaNOXIj3OCQ8eimAtIOhqjUQ--#1e80e
f84a16f2fa Added a comment 2017-02-14 20:21:41 +00:00
Joey Hess
69baa45f14
sync, merge: Fail when the current branch has no commits yet, instead of not merging in anything from remotes and appearing to succeed.
At first I wanted to make it go ahead and merge into the newborn branch,
so made it use Git.Branch.currentUnsafe to get the current branch. But that
failed:

fatal: ambiguous argument 'refs/heads/master..refs/heads/synced/master':
unknown revision or path not in the working tree.

A whole nother code path to handle merging into newborn branches seemed
excessive, so went with displaying a warning and propigating failure
status.

This commit was sponsored by Brock Spratlen on Patreon.
2017-02-14 16:09:55 -04:00
lasitus
9d690a18bd Added a comment 2017-02-14 19:08:38 +00:00
Joey Hess
248f48f754
add news item for git-annex 6.20170214 2017-02-14 14:56:57 -04:00
Joey Hess
95390f0c27
releasing package git-annex version 6.20170214 2017-02-14 14:56:11 -04:00
Joey Hess
4e3f4f6e4e
comment 2017-02-14 14:54:53 -04:00
Joey Hess
2d4a24bc6b
Merge branch 'master' of ssh://git-annex.branchable.com 2017-02-14 14:49:23 -04:00
lasitus
2233a50f45 Added a comment 2017-02-14 18:46:22 +00:00
Joey Hess
3aecb1d059
response 2017-02-14 14:21:58 -04:00
http://xgm.de/oid/
61f362b4ff 2017-02-14 18:14:24 +00:00
http://xgm.de/oid/
6a711d4a1d Added a comment 2017-02-14 18:03:27 +00:00
Joey Hess
de19340d7f
Merge branch 'master' of ssh://git-annex.branchable.com 2017-02-14 11:45:38 -04:00
Joey Hess
25e72dd30c
avoid OSX build failure when there are no rpaths to remove 2017-02-14 11:44:52 -04:00
https://me.yahoo.com/a/80VlVB0Bx9TaNOXIj3OCQ8eimAtIOhqjUQ--#1e80e
79e8d19850 removed 2017-02-14 00:05:09 +00:00
https://me.yahoo.com/a/80VlVB0Bx9TaNOXIj3OCQ8eimAtIOhqjUQ--#1e80e
6f31c717c2 Added a comment: Retrieving initremote parameters for new user 2017-02-14 00:04:50 +00:00
https://me.yahoo.com/a/80VlVB0Bx9TaNOXIj3OCQ8eimAtIOhqjUQ--#1e80e
3d786ebb4e Added a comment: Retrieving initremote parameters for new user 2017-02-14 00:03:35 +00:00
Joey Hess
7a06c91f7f
devblog 2017-02-13 17:42:03 -04:00
Joey Hess
3b22ad9f47
Work around sqlite's incorrect handling of umask when creating databases.
Refactored some common code into initDb.

This only deals with the problem when creating new databases. If a repo
got bad permissions into it, it's up to the user to deal with it.

This commit was sponsored by Ole-Morten Duesund on Patreon.
2017-02-13 17:39:16 -04:00
Joey Hess
d2174915c0
response 2017-02-13 16:19:39 -04:00
Joey Hess
47a4b552c0
comment 2017-02-13 16:11:58 -04:00
Joey Hess
748ecc51d8
remove recent addition of receive.denyNonFastForwards to walkthrough
That is a dangerous setting, and not needed.

I tried the walkthrough as it was without it, and syncing in the USB
remote worked ok. There was a problem merging from origin/master, since
that branch didn't exist yet, but that didn't prevent sync from working
at all.

To avoid even that problem, reordered the walkthrough, so files get
committed to the repo before the remote gets set up.

This commit was sponsored by Ole-Morten Duesund on Patreon.
2017-02-13 16:02:53 -04:00
Joey Hess
f431e1aec5
fix commit id 2017-02-13 15:55:32 -04:00
Joey Hess
f36adc2dbc
include problem PairData in error message
Users occasionally report this error firing, and I can't see why,
so include the rejected PairData in the error message.

This is safe even if it contains evil escape characters, because showing
it displays them in escaped form.

This commit was sponsored by Bruno BEAUFILS on Patreon.
2017-02-13 15:54:28 -04:00
Joey Hess
f36c230c78
comment 2017-02-13 15:39:46 -04:00
Joey Hess
976676a7b0
S3: Fix check of uuid file stored in bucket, which was not working.
The check was broken in two ways.. First, nowhere did it error out when
checkUUIDFile found a different UUID already in the file. Instead,
it overwrote the uuid file.

And, checkUUIDFile's implementation was for some reason always failing with
a ConnectionClosed exception. Apparently something to do with using two
different runResourceT's and a response getting GCed inbetween. I'm pretty
sure that used to work, but changed to a more obviously correct
implementation.

This commit was sponsored by Peter Hogg on Patreon.
2017-02-13 15:35:24 -04:00
Joey Hess
b6cfb9a73a
comment 2017-02-13 14:54:13 -04:00
Joey Hess
952474dabc
comment 2017-02-13 14:43:31 -04:00
Joey Hess
6479bf7158
Merge branch 'master' of ssh://git-annex.branchable.com 2017-02-13 12:46:15 -04:00
Joey Hess
3ecbde6376
fix OSX build 2017-02-13 12:41:28 -04:00
lasitus
e4218c0369 2017-02-13 03:08:14 +00:00
Edward Betts
0750913136
correct spelling mistakes 2017-02-12 17:30:23 -04:00
http://xgm.de/oid/
7102a73db2 2017-02-12 16:28:03 +00:00
edward
398125b573 correct spelling mistake 2017-02-11 09:16:26 +00:00
edward
d90c51b014 correct spelling mistake 2017-02-11 09:14:27 +00:00
Joey Hess
5e6ced7d0f
Improve pid locking code to work on filesystems that don't support hard links.
Probing for hard link support in the pid locking code is redundant since
git-annex init already probes that. But, it didn't seem worth threading
that data through; the pid locking code runs at most once per git-annex
process, and only on unusual filesystems. Optimising a single hard link
and unlink isn't worth it.

This commit was sponsored by Francois Marier on Patreon.
2017-02-10 15:22:28 -04:00
Joey Hess
913b3b51e3
comment 2017-02-10 14:51:50 -04:00
Joey Hess
1f43ecdf0e
comment 2017-02-10 14:04:55 -04:00
Joey Hess
e2c98f5788
Added git template directory to Linux standalone tarball and OSX app bundle.
Git does not provide a switch to find out where this directory is, and
while the git-init man page says it will always be in
/usr/share/git-core/templates, that's not the case on OSX with git
installed from homebrew. So, I used a hack taking the --man-path and
constructing a path from that. Works on both Debian and OSX at least.
2017-02-10 13:55:54 -04:00
Joey Hess
45f884418f
Merge branch 'master' of ssh://git-annex.branchable.com 2017-02-10 13:51:53 -04:00
yarikoptic
938db690a8 2017-02-10 02:33:49 +00:00
yarikoptic
c4f1d00a70 Added a comment 2017-02-10 01:38:33 +00:00
Joey Hess
0e7cbadf25
close 2017-02-09 18:59:45 -04:00
Joey Hess
ba61229c77
update 2017-02-09 18:58:13 -04:00
victorsavu3@d059e0a74888923e70a555ce8ab75e8ba00b6eb7
72311753b3 Added a comment: RequestTimeoutException when uploading to glacier 2017-02-09 20:45:42 +00:00