Commit graph

8310 commits

Author SHA1 Message Date
Joey Hess
dbb7e81b4f
comment 2018-07-06 12:44:32 -04:00
Joey Hess
e5ef7d63ae
Merge branch 'master' of ssh://git-annex.branchable.com 2018-07-05 11:53:47 -04:00
Joey Hess
49cc94f61f
add docs about p2p --pair being broken in old versions 2018-07-05 11:52:52 -04:00
git-annex.branchable.com@07c0f8919010cc703ae7eea746d9b494c153291f
78daed90d1 Added a comment 2018-07-05 15:47:14 +00:00
CandyAngel
f60e0df0e0 Added a comment 2018-07-05 13:53:47 +00:00
git-annex.branchable.com@07c0f8919010cc703ae7eea746d9b494c153291f
fb730c3731 2018-07-05 13:30:11 +00:00
nothingmuch
3fd2a66d57 2018-07-04 19:31:00 +00:00
Joey Hess
df1ed30549
remove comment to deleted non-bug 2018-07-02 12:34:29 -04:00
Joey Hess
3160cadba3 git-annex version 6.20180626
-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEKKUAw1IH6rcvbA8l2xLbD/BfjzgFAlstCaQACgkQ2xLbD/Bf
 jzh5nxAAn7D9soTI0ex6AVDDo2CjOyTTDVrIcl2h5XizfuUD3ev5P0TR3BZmzpAb
 MI6uaZ8kxqZ/eGAsBTyH9PsV7QVYIdht9t89ytP4xWyTQiOgjyJeA6PnJl4zVK9z
 Y8Of3mlylaz+97+sndljpsvy/KHENrHI7HHd+qxAu7wKysJxG6fJB7CjremkjaCI
 zAwg3mIy72ZKyuR/8hL9puJN9fdfw1ulkzQR+he007e/HkurPCwgRAOYW/Aa2tpY
 Oigdb9a6/0nl/VnOS8ZyHrSPRrhLH9c4IBmsdC1Xt5NDVmID/sWgD9uPF9dsHSMF
 OM25QdSlJ5cSNg+/XCpmmhC9MjgKkuVNpZ/fWBaHFs6KYgGhtZcAayQdz5AmMS2N
 HTPWB1IxZiV5TQHQpLbdH/q3RfNtRq1G1tc24zpd/zdhzijeTM6D8n4No6LXNq8X
 7U0qcrp9TdLOpBCTf6Jrg/7qFaXddHoEW1e3KrsOmB0hlYHuNxfY4bs0+ROeXGOT
 00koezcbF8kEI0ekoDvJjtVqaUq+608YjJZ5v7dE0vbtTj0KGbl5EHwC9atUluCX
 MHyTDY89uq68g4HIDytL001ZLvE3EUGJc4jh3+OMDzuZSKB5uwJIIky+qIaQu34K
 QJrZuyAIY0sVFV6LUX9nwqTW6Nnx/bB+kZ6k0+gx+Lpf7pUpE+o=
 =kex4
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEKKUAw1IH6rcvbA8l2xLbD/BfjzgFAlsxnX4ACgkQ2xLbD/Bf
 jzjK1xAAnJ58ZxLyTYlCZRcKiR81UHS/Mk6+SDAjRIRbT0SsY+6gSP55XKjrcuOb
 Jatp+6cNNSgk2lBpn37mq+rYIqboFh9moDRK7JSh1mDHCVtIwdARGblFRfuwaWPi
 xHnu+Pj43+SP7OF+8qP8/kDM+js3iMS+0gvBBz8pQN/yJDROXii6u0eONOd7vbER
 iRY9QpJdj5lp3hjaWfXt5iJC0re0eOAY4eUSHPsFIASysShnn33dFPOZ2hbhRKjR
 unQHUVIUE+ehmW3w9qIqn+9v2kca7laGK11cvzYRpmu/9rrvpf+RF1h42S8822dP
 CKHvxDkBGbyqTA+F9/6zpU1i9/ARgHFDpScRcdq7ZJi9FbWabKDklHCsgxwrkdXb
 +FXgb7N5Sa4+eVDNUf4rxldtLPX53nrtZ3IqrGiCWApCvbysNyP5kE0nix02l9z2
 xzY2vlpicx7TOMoO9mZesSFNgRzuFAbbya/zDJrz+xfgSRYXRYg58yTpmhpTFvSI
 h3Fw6+MYvehvRdAweLtoQt2p/UV2MAWrTpNzFoqgf2OCQOiH97ACDHn8Yki9rnQi
 NuMsqv9WOYQs4SaygDZMKemgAxftf3uaXiBW0RzHHwwWnDjHhqsEioOvOhNNyZbz
 U3OjKrH1JZlkNHlIBQD4BsWGLlIct66ZTU3k2OxPEp+mpEG/Xi4=
 =p+cW
 -----END PGP SIGNATURE-----

Merge tag '6.20180626' - previously embargoed security release
2018-06-25 21:56:43 -04:00
yves.noirjean@3f9b06d19a920fbf5c82340c362e5971b00d4af2
5d8d4de172 Added a comment 2018-06-22 07:53:26 +00:00
Joey Hess
4a89728d64
close 2018-06-21 15:49:11 -04:00
Joey Hess
838b65bd6b
update status 2018-06-21 13:45:07 -04:00
Joey Hess
537935333f
document CVE-2018-10859 2018-06-21 11:27:56 -04:00
Joey Hess
c5166b56af
second vuln 2018-06-19 17:03:04 -04:00
Joey Hess
c81b879d39
got a CVE number 2018-06-18 17:56:18 -04:00
Joey Hess
71d39caf5c
add security page with current and past security holes 2018-06-18 14:19:58 -04:00
Joey Hess
8703fdd3b7
add 2018-06-17 16:13:45 -04:00
git-annex.branchable.com@07c0f8919010cc703ae7eea746d9b494c153291f
7a44c2c8ef removed 2018-06-16 09:49:19 +00:00
git-annex.branchable.com@07c0f8919010cc703ae7eea746d9b494c153291f
fc468eed88 Added a comment: this one is invalid 2018-06-16 09:48:53 +00:00
git-annex.branchable.com@07c0f8919010cc703ae7eea746d9b494c153291f
75c4c947d5 2018-06-16 09:14:38 +00:00
Joey Hess
c8559a0403
close old bug 2018-06-15 14:44:32 -04:00
lykos@d125a37d89b1cfac20829f12911656c40cb70018
a439041e40 Added a comment 2018-06-13 10:46:25 +00:00
Joey Hess
760f66829a
display p2pstdio stderr after auth
Display error messages that come from git-annex-shell when the p2p protocol
is used, so that diskreserve messages, IO errors, etc from the remote side
are visible again.

Felt like it should perhaps use outputError, so --json-error-messages would
include these, but as an async IO action, it can't, and this would need
MessageState to be converted to a tvar. Anyway, when not using p2pstdio,
that's not done; nor is it done for stderr from external special remotes
or other commands, so punted on the idea for now.

This commit was sponsored by mo on Patreon.
2018-06-12 14:59:05 -04:00
Joey Hess
90a3afb60f
adb: Android serial numbers are not all 16 characters long, so accept other lengths.
I can't find any documentation of how long it should be. Hard to imagine
it being shorter than 4 characters though, so put that in as a conservative
lower bound.

This commit was sponsored by Nick Piper on Patreon.
2018-06-12 13:56:01 -04:00
Joey Hess
98168e8f2e
Merge branch 'master' of ssh://git-annex.branchable.com 2018-06-12 12:55:41 -04:00
Joey Hess
b0492384bb
response 2018-06-12 12:54:29 -04:00
lykos@d125a37d89b1cfac20829f12911656c40cb70018
75e4e45bea 2018-06-12 16:46:40 +00:00
lykos@d125a37d89b1cfac20829f12911656c40cb70018
eca49304fe 2018-06-12 16:46:22 +00:00
sudoman
8cba78f266 initial but submission 2018-06-05 22:08:57 +00:00
Joey Hess
fc5888300f
fix annex-checkuuid
Fixed annex-checkuuid implementation, so that remotes configured that way
can be used. This was 100% broken from the first commit of it, oops.

This commit was sponsored by Øyvind Andersen Holm.
2018-06-04 16:52:22 -04:00
Joey Hess
f1303e9146
close 2018-06-04 16:52:10 -04:00
Joey Hess
c3e1d0550f
fix incorrect comment 2018-06-04 16:50:53 -04:00
ypid
8afefb9ebe Added a comment 2018-06-04 19:42:30 +00:00
Joey Hess
67e46229a5
change Remote.repo to Remote.getRepo
This is groundwork for letting a repo be instantiated the first time
it's actually used, instead of at startup.

The only behavior change is that some old special cases for xmpp remotes
were removed. Where before git-annex silently did nothing with those
no-longer supported remotes, it may now fail in some way.

The additional IO action should have no performance impact as long as
it's simply return.

This commit was sponsored by Boyd Stephen Smith Jr. on Patreon
2018-06-04 15:30:26 -04:00
Joey Hess
dc5550a54e
analysis 2018-06-04 13:14:20 -04:00
Joey Hess
2e6a6024c2
avoid unncessary version output differences in different contexts
Show operating system and repository version list when run outside
a git repo too.

Also made it only display the local repository version when in a git-annex
repo. Before it showed "unknown" when run in a git repo that was not
git-annex initialized. That seemed like confusing behavior.

This commit was sponsored by Jochen Bartl on Patreon.
2018-06-04 12:26:18 -04:00
Joey Hess
95f7295b67
followup 2018-06-04 12:12:56 -04:00
ypid
37ca93b834 2018-06-03 13:08:33 +00:00
ypid
2d13c23112 Fix typo in bug report 2018-06-03 12:50:27 +00:00
ypid
b00415a3ff Create bug report: Operating system should be contained in git annex version output 2018-06-03 12:48:47 +00:00
sawmke
6eecfb19e6 2018-06-02 17:24:14 +00:00
Joey Hess
f09a235c87
Merge branch 'master' of ssh://git-annex.branchable.com 2018-05-31 11:49:35 -04:00
Joey Hess
0c803eee71
list all (non-archived) done bugs, not only most recent 10 2018-05-31 11:48:53 -04:00
andrew
008fd0d536 Added a comment: bare remotes, workflow 2018-05-31 12:50:55 +00:00
jhnichol@cce81d2a480707652a3340ea2f24b3dc4b1f808c
dffb0c1f5a Added a comment 2018-05-30 17:36:31 +00:00
Joey Hess
1c8ee99b46
Fix build with ghc 8.4+, which broke due to the Semigroup Monoid change
https://prime.haskell.org/wiki/Libraries/Proposals/SemigroupMonoid

I am not happy with the fragile pile of CPP boilerplate required to support
ghc back to 7.0, which git-annex still targets for both the android build
and the standalone build targeting old linux kernels. It makes me unlikely
to want to use Semigroup more in git-annex, because the benefit of the
abstraction is swamped by the ugliness. I actually considered ripping out
all the Semigroup instances, but some are needed to use
optparse-applicative.

The problem, I think, is they made this transaction on too fast a timeline.
(Although ironically, work on it started in 2015 or earlier!)
In particular, Debian oldstable is not out of security support, and it's
not possible to follow the simpler workarounds documented on the wiki and
have it build on oldstable (because the semigroups package in it is too
old).

I have only tested this build with ghc 8.2.2, not the newer and older
versions that branches of the CPP support. So there could be typoes, we'll
see.

This commit was sponsored by Brock Spratlen on Patreon.
2018-05-30 12:28:43 -04:00
andrew
ec4c867787 Added a comment 2018-05-30 15:24:47 +00:00
ilovezfs
cfd81b83a7 2018-05-30 06:08:11 +00:00
jhnichol@cce81d2a480707652a3340ea2f24b3dc4b1f808c
0b328c8a35 Added a comment 2018-05-24 19:28:28 +00:00
Joey Hess
2da2ae0919
fix migration bug and make fsck warn
* migrate: Fix bug in migration between eg SHA256 and SHA256E,
  that caused the extension to be included in SHA256 keys,
  and omitted from SHA256E keys.
  (Bug introduced in version 6.20170214)
* migrate: Check for above bug when migrating from SHA256 to SHA256
  (and same for SHA1 to SHA1 etc), and remove the extension that should
  not be in the SHA256 key.
* fsck: Detect and warn when keys need an upgrade, either to fix up
  from the above migrate bug, or to add missing size information
  (a long ago transition), or because of a few other past key related
  bugs.

This commit was sponsored by Henrik Riomar on Patreon.
2018-05-23 14:07:51 -04:00
Joey Hess
deff25549a
followup 2018-05-23 13:10:16 -04:00
anarcat
f08c6c6289 mark as done 2018-05-22 20:56:32 +00:00
anarcat
ac7fbfac03 Added a comment 2018-05-22 20:54:13 +00:00
grawity@2ea26be48562f66fcb9b66307da72b1e2e37453f
db2def89fe 2018-05-22 05:18:34 +00:00
Joey Hess
caaedb2993
fix http-client gzip decompression bug
Prevent haskell http-client from decompressing gzip files, so downloads of
such files works the same as it used to with wget and curl.

Explicitly setting accept-encoding to "identity" is probably not needed,
but that's what wget sends (curl does not send the header), and since
http-client is trying to be excessively smart, it seems we need to set
hAcceptEncoding to something to prevent it from inserting its own,
and this seems better than some hack like "".

This commit was sponsored by Ole-Morten Duesund on Patreon.
2018-05-21 15:10:25 -04:00
Joey Hess
f9e3bcdeb8
close 2018-05-21 15:06:29 -04:00
Joey Hess
2fabd7cdb5
remove the older move --force, which never behaved as documented and seems useless
* move: --force was accidentially enabling two unrelated behaviors
  since 6.20180427. The older behavior, which has never been well
  documented and seems almost entirely useless, has been removed.
* copy: --force no longer does anything.

This commit was sponsored by Øyvind Andersen Holm.
2018-05-21 13:21:19 -04:00
Joey Hess
ca6f5be284
followup 2018-05-21 12:51:55 -04:00
Joey Hess
e3c224913e
analysis 2018-05-21 12:14:30 -04:00
rrnewton@63c9faa1997c908b1dc04dfdca33c809660cd158
6a0379a056 tweak url 2018-05-21 05:13:10 +00:00
rrnewton@63c9faa1997c908b1dc04dfdca33c809660cd158
647745bb84 2018-05-21 05:12:20 +00:00
andrew
a34f982e7a Added a comment: thoughts? 2018-05-20 17:41:29 +00:00
https://openid-provider.appspot.com/iakornfeld
c97a6f9997 2018-05-18 14:02:29 +00:00
CandyAngel
5cbce5f308 2018-05-18 08:55:31 +00:00
spwhitton
d3117290cd Added a comment: patches welcome 2018-05-17 21:31:01 +00:00
anarcat
2c6c77bc16 Added a comment: .gitconfig was the cause, git-remote-gcrypt probably at fault 2018-05-17 20:42:37 +00:00
CandyAngel
295447a406 Added a comment 2018-05-17 20:21:47 +00:00
spwhitton
d43e44e3e5 Added a comment: analysis 2018-05-17 19:49:04 +00:00
CandyAngel
1d58205284 Added a comment 2018-05-17 19:14:25 +00:00
anarcat
78a0bf4814 reproduced with remote-gcrypt 1.1 2018-05-17 17:39:35 +00:00
anarcat
fc68caa435 problems using gcrypt remote for basic stuff 2018-05-17 17:27:27 +00:00
CandyAngel
bcf732aca5 2018-05-16 21:58:53 +00:00
https://openid-provider.appspot.com/iakornfeld
65f55e448c Added a comment: Looking at code 2018-05-15 19:01:10 +00:00
Joey Hess
8c8e1f8b7a
close 2018-05-15 12:07:35 -04:00
Joey Hess
2463d4b855
response 2018-05-15 11:54:02 -04:00
https://openid-provider.appspot.com/iakornfeld
47ff8fa976 more failures to copy/paste 2018-05-15 15:15:37 +00:00
https://openid-provider.appspot.com/iakornfeld
5ed04a326a Added a comment: Another weird bit 2018-05-15 14:59:42 +00:00
https://openid-provider.appspot.com/iakornfeld
28c1348140 fix failure to copy/paste 2018-05-15 14:56:54 +00:00
https://openid-provider.appspot.com/iakornfeld
24959e9acd 2018-05-15 14:55:14 +00:00
Joey Hess
d7021d420f
reuse hashes of dotfiles/dirs/submodules when entering view
This fixes a crash when a git submodule has a name starting with a dot.
Such a submodule might contain dotfiles that are intended to be used when
inside the view (since a dot-directory that's not a submodule was already
preserved when entering a view). So, rather than eliminating the submodule
from the view, its git ls-files --stage hash is copied over into the view.

dotfiles/dirs have their git ls-files --stage hashes similarly copied over
to the view. This is more efficient and simpler than the old method,
and also won't break if git ever adds a new type of tree item, like was
done with submodules.

Since the content of dotfiles in the working tree is no longer hashed
when entering a view, when there are unstaged modifications, they are
not included in the view branch. Entering the view branch still works,
but git checkout shows "M .dotfile", and git diff will show the unstaged
changes. This seems like an improvement over the old behavior.

Also made Command.View not delete empty directories that are submodules
when entering a view, while still deleting other empty directories.

This commit was supported by the NSF-funded DataLad project.
2018-05-14 15:35:20 -04:00
Joey Hess
a732004616
update 2018-05-14 13:18:20 -04:00
Joey Hess
6fffcccb53
followup 2018-05-14 13:15:27 -04:00
gdkags@28c74e22834edcf63c178e595b8649e5af5151d4
e646b22fd2 Added a comment: fine with me! 2018-05-10 13:02:23 +00:00
ga@2217a6e07239bc6b36af2a9134b2647fdebcabcd
61d083765e Added a comment: Arm processor on Synology device 2018-05-10 11:07:44 +00:00
yarikoptic
d801a33184 Added a comment: details 2018-05-09 01:12:31 +00:00
Joey Hess
db720f6a9c
Display error message when http download fails.
* Display error message when http download fails.

  There's nothing in the http-client library to nicely format a http
  exception, so in some cases it has to fall back to using show on it.
  Seems better than just saying "it failed" or only showing the http
  status code.

* Avoid forward retry when 0 bytes were received.

  forwardRetry was comparing Nothing to Just 0, and so thought there had
  been progress made when 0 bytes were received.

This commit was supported by the NSF-funded DataLad project.
2018-05-08 16:11:45 -04:00
Joey Hess
c0ffd02ac5
close almost all old Android app bug reports
The old git-annex Android app is now deprecated in favor of running
git-annex in termux. I suspect all or nearly all of these no longer apply.

This commit was sponsored by Jochen Bartl on Patreon.
2018-05-08 15:00:46 -04:00
Joey Hess
2948f6d916
avoid uname -o on !linux and catch any exception from it
Fix bug in last release that prevented the webapp opening on non-Linux systems.

This commit was sponsored by Jake Vosloo on Patreon.
2018-05-08 14:06:19 -04:00
Joey Hess
b2e03bb428
followup 2018-05-08 14:00:13 -04:00
Joey Hess
d1961e4498
back out incorrect IO interleaving change
Fix regression in last release that crashes when using --all or running
git-annex in a bare repository. May have also affected git-annex unused and
git-annex info.

Reversed the order of the (++) in Annex.Branch.files so --all will stream
lazily still when there are not a bunch of uncommitted journal files.
Added a todo to maybe improve this later.

This commit was sponsored by Trenton Cronholm on Patreon.
2018-05-08 13:54:42 -04:00
yarikoptic
348c6d56f9 added my meta 2018-05-08 02:43:38 +00:00
yarikoptic
c8451f14f6 2018-05-08 01:56:04 +00:00
yarikoptic
c85cb8e9f0 initial report on problem fetching from web within docker container 2018-05-06 15:44:55 +00:00
ga@2217a6e07239bc6b36af2a9134b2647fdebcabcd
59ae9f3f85 Added a comment: Same error 2018-05-05 05:28:35 +00:00
andrew
a2e9f8a06d Added a comment 2018-05-04 15:58:59 +00:00
andrew
abf7436e43 Added a comment 2018-05-04 15:00:18 +00:00
andrew
fd135b1e40 2018-05-04 13:48:51 +00:00
yarikoptic
cdb9a11a64 initial report 2018-05-04 03:08:51 +00:00
jhnichol@cce81d2a480707652a3340ea2f24b3dc4b1f808c
fb61e8986a clarify 2018-04-29 19:43:07 +00:00
jhnichol@cce81d2a480707652a3340ea2f24b3dc4b1f808c
225351246b simplify 2018-04-29 19:39:48 +00:00