Joey Hess [Tue, 15 Nov 2016 22:26:17 +0000 (18:26 -0400)]
sync: Pass --allow-unrelated-histories to git merge when used with git git 2.9.0 or newer.
This makes merging a remote into a freshly created direct mode repository
work the same as it works in indirect mode.
The git-annex branches would get merged in any case by a sync,
since that doesn't use git merge.
This might need to be revisited later to better mirror git's behavior.
Joey Hess [Tue, 15 Nov 2016 15:19:57 +0000 (11:19 -0400)]
unbreak all the autobuilders
git-annex.cabal: Loosen bounds on persistent to allow 2.5, which on Debian
has been patched to work with esqueleto. This may break cabal's resolver on
non-Debian systems; if so, either use stack to build, or run cabal with
--constraint='persistent ==2.2.4.1' Hopefully this mess with esqueleto will
be resolved soon.
https://github.com/prowdsponsor/esqueleto/issues/137
Joey Hess [Tue, 15 Nov 2016 15:02:21 +0000 (11:02 -0400)]
close
Joey Hess [Tue, 15 Nov 2016 15:00:04 +0000 (11:00 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com
Added a comment
https://launchpad.net/~stephane-gourichon-lpad [Tue, 15 Nov 2016 10:58:32 +0000 (10:58 +0000)]
Added a comment: "Hmm, guyz? Are you serious with these scripts?" Well, what's the matter?
thowz [Tue, 15 Nov 2016 02:27:52 +0000 (02:27 +0000)]
Joey Hess [Mon, 14 Nov 2016 22:37:56 +0000 (18:37 -0400)]
local lan detection
Joey Hess [Mon, 14 Nov 2016 20:50:14 +0000 (16:50 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Mon, 14 Nov 2016 20:49:18 +0000 (16:49 -0400)]
devblog
Joey Hess [Mon, 14 Nov 2016 19:04:16 +0000 (15:04 -0400)]
no-xmpp branch
Joey Hess [Mon, 14 Nov 2016 16:10:09 +0000 (12:10 -0400)]
updated design
more details on using tor and pairing
gfa@1e86118cd41fbfea50004af221471ad97b55af18 [Mon, 14 Nov 2016 09:13:20 +0000 (09:13 +0000)]
Added a comment: same on Debian
Added a comment
mail@de3e4e58ccb420b8d9b78ef262ee0c80e021f199 [Sun, 13 Nov 2016 02:40:02 +0000 (02:40 +0000)]
Added additional comment about it working if I build from source
mail@de3e4e58ccb420b8d9b78ef262ee0c80e021f199 [Sun, 13 Nov 2016 01:23:15 +0000 (01:23 +0000)]
mail@4e627fd997ef5ca9f75e62ffc0aba5b27bd6aea1 [Sat, 12 Nov 2016 18:17:28 +0000 (18:17 +0000)]
https://tribut.de/ [Sat, 12 Nov 2016 13:15:29 +0000 (13:15 +0000)]
Joey Hess [Fri, 11 Nov 2016 22:39:05 +0000 (18:39 -0400)]
remove redundant constraint
Joey Hess [Fri, 11 Nov 2016 22:14:25 +0000 (18:14 -0400)]
add missing type signature
Joey Hess [Fri, 11 Nov 2016 18:47:46 +0000 (14:47 -0400)]
add news item for git-annex 6.
20161111
Joey Hess [Fri, 11 Nov 2016 18:47:31 +0000 (14:47 -0400)]
releasing package git-annex version 6.
20161111
Joey Hess [Thu, 10 Nov 2016 19:12:08 +0000 (15:12 -0400)]
Linux standalone: Avoid using hard links in the tarball so it can be untarred on eg, afs which does not support them.
Joey Hess [Thu, 10 Nov 2016 18:21:16 +0000 (14:21 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Thu, 10 Nov 2016 18:19:09 +0000 (14:19 -0400)]
comment
Joey Hess [Thu, 10 Nov 2016 17:48:54 +0000 (13:48 -0400)]
webapp: Explicitly avoid checking for auth in static subsite requests.
Yesod didn't used to do auth checks for that, but this may have changed.
I don't have a way to reproduce the reported problem yet, but this change
certianly won't hurt anything.
This commit was sponsored by Thom May on Patreon.
openmedi [Thu, 10 Nov 2016 12:53:34 +0000 (12:53 +0000)]
Added a comment
Added a comment
grawity@2ea26be48562f66fcb9b66307da72b1e2e37453f [Thu, 10 Nov 2016 06:34:44 +0000 (06:34 +0000)]
prefer per-user, fix ExecStart syntax
jesrui@51c25da8d6f34e6df8e3e7ed0277335ed7ddf6a6 [Thu, 10 Nov 2016 00:36:05 +0000 (00:36 +0000)]
lykos@d125a37d89b1cfac20829f12911656c40cb70018 [Wed, 9 Nov 2016 21:44:26 +0000 (21:44 +0000)]
Added a comment: Android 6/7?
public@881708f3cb16d1f967ca9f517a310dd211474013 [Wed, 9 Nov 2016 21:25:00 +0000 (21:25 +0000)]
Added a comment: not specific to cloud repo
Added a comment
Joey Hess [Tue, 8 Nov 2016 18:55:53 +0000 (14:55 -0400)]
meh
Joey Hess [Tue, 8 Nov 2016 18:53:09 +0000 (14:53 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Tue, 8 Nov 2016 18:52:29 +0000 (14:52 -0400)]
close
initial whining
public@881708f3cb16d1f967ca9f517a310dd211474013 [Tue, 8 Nov 2016 14:53:48 +0000 (14:53 +0000)]
Added a comment: joey's test build fixes issue
Euxane [Tue, 8 Nov 2016 10:12:05 +0000 (10:12 +0000)]
Added a comment
Euxane [Tue, 8 Nov 2016 10:10:12 +0000 (10:10 +0000)]
public@881708f3cb16d1f967ca9f517a310dd211474013 [Tue, 8 Nov 2016 01:14:43 +0000 (01:14 +0000)]
ddenis [Mon, 7 Nov 2016 21:32:11 +0000 (21:32 +0000)]
ddenis [Mon, 7 Nov 2016 21:30:07 +0000 (21:30 +0000)]
Joey Hess [Mon, 7 Nov 2016 18:23:01 +0000 (14:23 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Mon, 7 Nov 2016 18:21:30 +0000 (14:21 -0400)]
OSX: Remove RPATHs from git-annex binary, which are not needed, slow down startup, and break the OSX Sierra linker.
ghc 8.0.2 may make this unncessary, but it's not in a stackage version yet,
so put in a workaround.
Note that the linux builds already delete the RPATHs for similar reasons.
This commit was sponsored by Josh Taylor on Patreon.
edward [Mon, 7 Nov 2016 17:43:31 +0000 (17:43 +0000)]
Added a comment
Joey Hess [Mon, 7 Nov 2016 17:41:21 +0000 (13:41 -0400)]
response
Joey Hess [Mon, 7 Nov 2016 17:40:02 +0000 (13:40 -0400)]
edit
Joey Hess [Mon, 7 Nov 2016 17:38:13 +0000 (13:38 -0400)]
comment
Joey Hess [Mon, 7 Nov 2016 17:32:15 +0000 (13:32 -0400)]
comment
Joey Hess [Mon, 7 Nov 2016 16:07:36 +0000 (12:07 -0400)]
reinject --known: Avoid second, unncessary checksum of file.
Joey Hess [Mon, 7 Nov 2016 15:49:34 +0000 (11:49 -0400)]
S3: Support the special case endpoint needed for the cn-north-1 region.
* S3: Support the special case endpoint needed for the cn-north-1 region.
* Webapp: Don't list the Frankfurt region, as this (and some other new
regions) need V4 authorization which the aws library does not yet use.
This commit was sponsored by Nick Daly on Patreon.
Joey Hess [Mon, 7 Nov 2016 14:56:45 +0000 (10:56 -0400)]
response
Joey Hess [Mon, 7 Nov 2016 14:43:23 +0000 (10:43 -0400)]
comment
Joey Hess [Mon, 7 Nov 2016 14:38:25 +0000 (10:38 -0400)]
comment
Joey Hess [Mon, 7 Nov 2016 14:32:57 +0000 (10:32 -0400)]
Make .git/annex/ssh.config file work with versions of ssh older than 7.3, which don't support Include.
When used with an older version of ssh, any ServerAliveInterval in
~/.ssh/config will be overridden by .git/annex/ssh.config.
This commit was sponsored by Josh Taylor on Patreon.
Joey Hess [Mon, 7 Nov 2016 14:16:09 +0000 (10:16 -0400)]
analysis
Euxane [Mon, 7 Nov 2016 11:07:33 +0000 (11:07 +0000)]
Added a comment
0xloem@0bd8a79a57e4f0dcade8fc81d162c37eae4d6730 [Sun, 6 Nov 2016 11:42:48 +0000 (11:42 +0000)]
Added a comment
spiderbit [Sat, 5 Nov 2016 17:38:26 +0000 (17:38 +0000)]
Added a comment: update
spiderbit [Sat, 5 Nov 2016 17:00:54 +0000 (17:00 +0000)]
Added a comment: dont have success with other download commands
Added a comment: workaround to my request
https://launchpad.net/~stephane-gourichon-lpad [Sat, 5 Nov 2016 11:10:42 +0000 (11:10 +0000)]
Which operations are safe to interrupt? What will be the result? No change? Partial but valid result? Messy result? With what consequences?
Added a comment
removed
Added a comment: china cn-north-1 s3 remote issue
Added a comment: how to use normal rm to files directly?
edward [Fri, 4 Nov 2016 18:15:00 +0000 (18:15 +0000)]
unlock should warn if file isn't in repo
https://launchpad.net/~stephane-gourichon-lpad [Fri, 4 Nov 2016 12:54:02 +0000 (12:54 +0000)]
What happens in 7 minutes before "checksum..." appears?
Added a comment: should annex merge autoenable newly added autoenable'ed special remotes
Added a comment
https://launchpad.net/~stephane-gourichon-lpad [Fri, 4 Nov 2016 09:56:45 +0000 (09:56 +0000)]
Added a comment: git-annex+git consumes lots of inodes. They are cheap, don't limit their amount when creating a filesystem.
EskildHustvedt [Fri, 4 Nov 2016 07:34:30 +0000 (07:34 +0000)]
Added a comment
Gus [Thu, 3 Nov 2016 18:13:54 +0000 (18:13 +0000)]
Added a comment: Why overwrite the files?
CandyAngel [Thu, 3 Nov 2016 10:17:50 +0000 (10:17 +0000)]
Added a comment
caleb@2b0d6f0eabf955cc8fd04c634b09f0ca4aad9233 [Thu, 3 Nov 2016 09:54:34 +0000 (09:54 +0000)]
Added a comment: Arch packages
CandyAngel [Thu, 3 Nov 2016 09:44:23 +0000 (09:44 +0000)]
Added a comment
Added a comment: ssh and encryption
https://launchpad.net/~stephane-gourichon-lpad [Wed, 2 Nov 2016 16:55:04 +0000 (16:55 +0000)]
Which leaves us to choose the filesystem based on safety and performance of reading a git repository with 100k to 1M symlinks.
Joey Hess [Wed, 2 Nov 2016 15:07:37 +0000 (11:07 -0400)]
fixed
Joey Hess [Wed, 2 Nov 2016 15:01:33 +0000 (11:01 -0400)]
expand haskell section of contribute page
Joey Hess [Wed, 2 Nov 2016 14:37:50 +0000 (10:37 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com
CandyAngel [Wed, 2 Nov 2016 10:37:49 +0000 (10:37 +0000)]
Added a comment
CandyAngel [Wed, 2 Nov 2016 10:03:46 +0000 (10:03 +0000)]
Added a comment
CandyAngel [Wed, 2 Nov 2016 09:58:25 +0000 (09:58 +0000)]
mx781 [Wed, 2 Nov 2016 05:32:43 +0000 (05:32 +0000)]
Joey Hess [Tue, 1 Nov 2016 18:31:10 +0000 (14:31 -0400)]
response
Joey Hess [Tue, 1 Nov 2016 18:25:58 +0000 (14:25 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Tue, 1 Nov 2016 18:25:51 +0000 (14:25 -0400)]
update
Joey Hess [Tue, 1 Nov 2016 18:03:55 +0000 (14:03 -0400)]
restart coprocess in raw mode
Restarting a crashing git process could result in filename encoding issues
when not in a unicode locale, as the restarted processes's handles were not
read in raw mode.
Since rawMode is always used when starting a coprocess, didn't bother
to parameterise it and just always enable it for simplicity.
This commit was sponsored by Jake Vosloo on Patreon.
Joey Hess [Tue, 1 Nov 2016 17:50:09 +0000 (13:50 -0400)]
retitle
0xloem@0bd8a79a57e4f0dcade8fc81d162c37eae4d6730 [Tue, 1 Nov 2016 11:21:55 +0000 (11:21 +0000)]
Added a comment
projects / git-annex.git / log