Commit graph

31604 commits

Author SHA1 Message Date
Joey Hess
8f71b316c9
remove chrpath hack
Makefile: Remove chrpath workaround for bug in cabal,  which is no longer
needed.

https://github.com/haskell/cabal/issues/2717 says it uses RUNPATH instead
of RPATH now, but I don't even see that for statically linked libraries;
the bug with that appears to be fixed.

cabal-install version 1.24.0.2
compiled using version 1.24.2.0 of the Cabal library

I left the rpath removal using otool on OSX because those straight up
broke the linker, and I don't know if the OSX autobuilder is updated to
a new enough cabal to not need it.

This commit was sponsored by Ewen McNeill on Patreon.
2018-02-27 12:02:38 -04:00
Joey Hess
b1c0e44c33
remove spam
This is how you get banned, get your IP block banned.
2018-02-27 11:27:19 -04:00
Joey Hess
ba787096e2
Merge branch 'master' of ssh://git-annex.branchable.com 2018-02-27 11:11:25 -04:00
CandyAngel
32d682dd8a Added a comment 2018-02-27 10:59:02 +00:00
marjor
940f324f85 removed 2018-02-27 10:07:54 +00:00
marjor
d72281df79 Added a comment 2018-02-27 10:07:32 +00:00
marjor
3a83e73e9f 2018-02-27 10:05:32 +00:00
jeff@184d5cbb24509ab635773e72bc758c99847e45da
15a11fedf9 2018-02-26 21:40:11 +00:00
Joey Hess
f99af09322
wording 2018-02-26 14:36:40 -04:00
Joey Hess
db057dcff0
fix sync bug in direct mode
sync: Fix bug that prevented pulling changes into direct mode repositories
that were committed to remotes using git commit rather than git-annex sync.

This commit was supported by the NSF-funded DataLad project.
2018-02-26 14:10:03 -04:00
Joey Hess
42f154bd7e
Fix metadata hook script to support non-ascii characters
tips/automatically_adding_metadata/pre-commit-annex: Fix to not silently
skip filenames containing non-ascii characters.

git diff-index defaults to munging non-ascii characters. Using -z makes
it not do that, and then we just change the nulls to newlines.

This commit was sponsored by Jochen Bartl on Patreon.
2018-02-26 12:58:37 -04:00
git-annex@6f13b739194f758abc0b86556b7ce966c1bf3c00
48819cb92b 2018-02-26 10:40:06 +00:00
git-annex@6f13b739194f758abc0b86556b7ce966c1bf3c00
538cd3cfa9 2018-02-26 09:43:10 +00:00
ericm
00b545544e Added a comment 2018-02-24 03:29:21 +00:00
yarikoptic
629de12e6c original discovery 2018-02-23 19:19:57 +00:00
Joey Hess
09e73a3ab6
annex.merge-annex-branches
Added annex.merge-annex-branches config setting which can be used to
disable automatic merge of git-annex branches.

I wonder if git-annex merge/sync/assistant should disable this
setting? Not sure yet, so have not done so. May be that users will not set
it in git config, but pass it via -c to commands that need it.

Checking the config setting adds a very small overhead, but it's
only checked once per command so should be insignificant.

This commit was supported by the NSF-funded DataLad project.
2018-02-22 14:25:32 -04:00
Joey Hess
addb91b24b
wording 2018-02-22 13:55:09 -04:00
Joey Hess
497c20593e
Merge branch 'master' of ssh://git-annex.branchable.com 2018-02-22 13:20:40 -04:00
Joey Hess
cb3b73df6c
importfeed: Fix a failure when downloading with youtube-dl and the destination subdirectory does not exist yet.
Noticed while running this (which a user posted in a comment they deleted
for some reason):

git-annex importfeed https://vimeo.com/logiingimars/videos/rss

The filename that youtube-dl suggests included a subdirectory,
which didn't exist, so renaming to it failed.

This commit was sponsored by mo on Patreon.
2018-02-22 13:20:19 -04:00
yarikoptic
a8b870311c Added a comment: --read-only flag? 2018-02-22 17:18:18 +00:00
Joey Hess
a944549db9
response 2018-02-22 12:59:44 -04:00
Joey Hess
06454be3a7
remove duplicate comment 2018-02-22 12:55:13 -04:00
Joey Hess
ffd015c9f2
response 2018-02-22 12:52:31 -04:00
Joey Hess
2d1dd79d02
response 2018-02-22 12:49:46 -04:00
Joey Hess
2e25185a9c
Remove temporary code added in 6.20160619 to prime the mergedrefs log.
Repositories that are upgraded from before that version to this
one will not break, but will just not see the benefit of the mergedrefs log
speeding things up, until one new ref gets merged in.
2018-02-22 12:31:27 -04:00
Joey Hess
ef342dad79
remove spam 2018-02-22 12:14:53 -04:00
avdhusingh6497@d72e8319bb7c179778775a8b096b120fc219fbad
2259089eb9 Added a comment: iTunes Error 56 Apple 2018-02-22 11:51:41 +00:00
avdhusingh6497@d72e8319bb7c179778775a8b096b120fc219fbad
5bc1755971 Added a comment: iTunes Error 56 Apple 2018-02-22 11:48:40 +00:00
andrew
829eac30f5 Added a comment: switching to amazonka 2018-02-21 18:15:05 +00:00
Yaroslav Halchenko
8e8b4634be
Updated patch for standalone 2018-02-20 16:15:00 -04:00
Joey Hess
dacea14385
Merge branch 'master' of ssh://git-annex.branchable.com 2018-02-20 13:01:11 -04:00
Joey Hess
8104f2f758
done 2018-02-20 13:00:51 -04:00
yarikoptic
5e0d594782 initial complaints about needing write permissions for info command 2018-02-20 00:02:11 +00:00
moaxey
34b84bdc44 Added a comment: Thanks 2018-02-19 20:57:09 +00:00
Joey Hess
e162efdbd6
Merge branch 'master' of ssh://git-annex.branchable.com 2018-02-19 15:57:32 -04:00
Joey Hess
ff134618f0
split msg into lines
msg is what would be output to stderr, so has some layout and
formatting, which is perhaps not ideal, but let's at least avoid it
containing line breaks.
2018-02-19 15:55:00 -04:00
Joey Hess
572754c925
update 2018-02-19 15:54:56 -04:00
Joey Hess
fbfac04cef
wording 2018-02-19 15:41:56 -04:00
Joey Hess
0292af8520
fix build 2018-02-19 15:39:52 -04:00
Joey Hess
84a74b80ee
better doc for --json-error-messages
Word so warnings can be included, not only errors.
2018-02-19 15:33:59 -04:00
Joey Hess
39b59c341f
send stderr to json when --json-error-messages enabled 2018-02-19 15:28:38 -04:00
Joey Hess
63ff670cc5
always include error-messages field when --json-error-messages
Always include error-messages field, even if empty,
to make the json be self-documenting.

This was a design requirement for --json-error-messages.

This commit was supported by the NSF-funded DataLad project.
2018-02-19 15:07:00 -04:00
Joey Hess
6583448bab
add --json-error-messages (not yet implemented)
Added --json-error-messages option, which includes error messages in the
json output, rather than outputting them to stderr.

The actual rediretion of errors is not implemented yet, this is only
the docs and option plumbing.

This commit was supported by the NSF-funded DataLad project.
2018-02-19 14:32:15 -04:00
Joey Hess
fa65f1d240
fix --json-progress --json to be same as --json --json-progress
Fix behavior of --json-progress followed by --json, in which
the latter option disabled the former.

This commit was supported by the NSF-funded DataLad project.
2018-02-19 14:12:15 -04:00
olaf
288e1dc77c Added a comment: I can reproduce 2018-02-19 01:05:06 +00:00
Joey Hess
8ccfbd14d0
Split Test.hs and avoid optimising it much, to need less memory to compile.
The ghc options were found by Sean Whitton; the debian arm autobuilders
need those to build w/o OOM, and it seems to involve llvm using too much
memory to optimize Test.

This commit was sponsored by Boyd Stephen Smith Jr. on Patreon.
2018-02-18 11:48:48 -04:00
Joey Hess
bbdfdaa833
git-annex.cabal: Once more try to not build the assistant on the hurd, hopefully hackage finally recognises that OS.
Last try was in 2015 https://github.com/haskell/hackage-server/issues/269
2018-02-18 11:09:16 -04:00
ericm
f5bc4065c4 Added a comment 2018-02-18 13:46:00 +00:00
michalrus
5846c2f466 2018-02-17 14:43:36 +00:00
yarikoptic
fb2c7d180a Added a comment 2018-02-16 18:42:28 +00:00