Commit graph

22209 commits

Author SHA1 Message Date
benjamin.poldrack@d09ccff6d42dd20277610b59867cf7462927b8e3
c6094c43fa 2017-03-27 11:34:41 +00:00
benjamin.poldrack@d09ccff6d42dd20277610b59867cf7462927b8e3
5f64e2007a 2017-03-27 09:36:05 +00:00
benjamin.poldrack@d09ccff6d42dd20277610b59867cf7462927b8e3
b7b70acd71 Added a comment 2017-03-27 09:03:10 +00:00
Cyberthal
2076d04231 Added a comment: knowing about annex-ignore and git-annex shell helps 2017-03-26 10:06:35 +00:00
Cyberthal
86db277648 2017-03-26 10:02:22 +00:00
yarikoptic
ea8d0d923b 2017-03-24 21:10:44 +00:00
Cyberthal
9d21f1461b 2017-03-24 15:59:12 +00:00
Cyberthal
9713258e9b 2017-03-24 15:10:10 +00:00
magnitude
de864ef0de 2017-03-24 06:07:04 +00:00
yarikoptic
a6430481c4 initial report 2017-03-23 04:09:44 +00:00
yarikoptic
6e11108d55 initial report 2017-03-22 18:59:49 +00:00
joern.mankiewicz@06fb5bc9b732f143dee3606866362f562531310d
e3bd899e5e 2017-03-22 14:45:11 +00:00
joern.mankiewicz@06fb5bc9b732f143dee3606866362f562531310d
02b61aee9a removed 2017-03-21 22:08:52 +00:00
joern.mankiewicz@06fb5bc9b732f143dee3606866362f562531310d
877d42fe77 Added a comment: Workflow for adding a keyid in hybrid-enc lateron and re-encrypting? 2017-03-21 22:08:30 +00:00
joern.mankiewicz@06fb5bc9b732f143dee3606866362f562531310d
fe73a5b778 Added a comment: Workflow for adding a keyid in hybrid-enc lateron and re-encrypting? 2017-03-21 22:08:22 +00:00
ewen
ec35d57200 Added a comment: Tracking GUIDs 2017-03-21 21:46:27 +00:00
ewen
9e84c0210b Add note about tracking guids since 2015 2017-03-21 21:36:36 +00:00
Joey Hess
89d47f0cd0
add news item for git-annex 6.20170321 2017-03-21 13:47:26 -04:00
Joey Hess
a344d1e2f8
comment 2017-03-21 13:44:42 -04:00
Joey Hess
e183270393
comment 2017-03-21 13:43:10 -04:00
Joey Hess
e398a9854c
Merge branch 'master' of ssh://git-annex.branchable.com 2017-03-21 13:35:16 -04:00
Joey Hess
297bcbcaad
comment 2017-03-21 13:34:52 -04:00
konubinix
f3dee9d658 removed 2017-03-21 15:42:50 +00:00
konubinix
04fb8e7896 removed 2017-03-21 15:40:16 +00:00
konubinix
9ec8466302 removed 2017-03-21 15:37:54 +00:00
konubinix
9b53859c67 removed 2017-03-21 15:37:28 +00:00
konubinix
5f7f61febb removed 2017-03-21 15:36:46 +00:00
konubinix
14b96acb60 Added a comment: Nice job! 2017-03-21 15:36:18 +00:00
konubinix
88bbb04f29 Added a comment: Nice job! 2017-03-21 15:36:07 +00:00
konubinix
2bdcdd6186 Added a comment: Nice job! 2017-03-21 15:35:56 +00:00
konubinix
2c069ee2a5 Added a comment: Nice job! 2017-03-21 15:35:45 +00:00
konubinix
9dae7e0bdd Added a comment: Nice job! 2017-03-21 15:35:37 +00:00
konubinix
b78408377e Added a comment: Nice job! 2017-03-21 15:35:27 +00:00
ewen
856e7a5f50 Added a comment: Track GUIDs to avoid duplicate downloads 2017-03-21 08:59:59 +00:00
ewen
12831ed724 removed 2017-03-21 08:49:19 +00:00
ewen
4652413766 Added a comment: Track GUIDs to avoid duplicate downloads 2017-03-21 08:48:05 +00:00
joern.mankiewicz@06fb5bc9b732f143dee3606866362f562531310d
9abed537f7 Added a comment: Beware global configurations! 2017-03-20 22:47:50 +00:00
Joey Hess
217cdbe6c8
comment 2017-03-20 17:19:33 -04:00
Joey Hess
a5ddef4ba3
response 2017-03-20 17:17:25 -04:00
Joey Hess
c09b7cb232
Merge branch 'master' of ssh://git-annex.branchable.com 2017-03-20 17:14:40 -04:00
Joey Hess
30a167afe3
devblog 2017-03-20 17:13:18 -04:00
joern.mankiewicz@06fb5bc9b732f143dee3606866362f562531310d
a88fa9f28a Added a comment: Git-annex ignores annex.largefiles in .gitattributes 2017-03-20 20:58:12 +00:00
Joey Hess
64f924dc93
sync --content-of=path
For when you want to sync only some files' contents, not the whole working
tree.

This commit was sponsored by Anthony DeRobertis on Patreon.
2017-03-20 16:00:48 -04:00
Joey Hess
6ab94fbf93
Merge branch 'master' of ssh://git-annex.branchable.com 2017-03-18 15:45:06 -04:00
Joey Hess
631608d55b
todo 2017-03-18 15:44:52 -04:00
oliv5@5a9bb4b174f7995da105238c4e7b3f91767a87bc
35a37f7fc4 2017-03-18 13:46:58 +00:00
Joey Hess
e038005e80
devblog 2017-03-17 19:20:51 -04:00
Joey Hess
faecd73f32
Support GIT_SSH and GIT_SSH_COMMAND
They are handled close the same as they are by git. However, unlike git,
git-annex sometimes needs to pass the -n parameter when using these.

So, this has the potential for breaking some setup, and perhaps there ought
to be a ANNEX_USE_GIT_SSH=1 needed to use these. But I'd rather avoid that
if possible, so let's see if anyone complains.

Almost all places where "ssh" was run have been changed to support the env
vars. Anything still calling sshOptions does not support them. In
particular, rsync special remotes don't. Seems that annex-rsync-transport
already gives sufficient control there.

(Fixed in passing: Remote.Helper.Ssh.toRepo used to extract
remoteAnnexSshOptions and pass them to sshOptions, which was redundant
since sshOptions also extracts those.)

This commit was sponsored by Jeff Goeke-Smith on Patreon.
2017-03-17 16:20:37 -04:00
Joey Hess
8cd473c716
Merge branch 'master' of ssh://git-annex.branchable.com 2017-03-17 12:33:52 -04:00
Joey Hess
999743c1e8
git-annex-shell: run all commands with noMessages
Fix bug when used with a recently cloned repository, where
"merging" messages were included in the output of configlist (and perhaps
other commands) and caused a "Failed to get annex.uuid configuration"
error.

This does not seem to have been a reversion.

I saw this with configlist, but it seems possible for other commands to be
effected, and it might not always happen only after a fresh clone. Eg, if a
foo/git-annex branch is pushed to the remote, the next git-annex-shell will
auto-merge it and display the message.

Decided to run all git-annex-shell commands with noMessages,
even ones that don't currently use stdout for structured communication.
Better to keep open the possibility for using stdout in the future.

This commit was supported by the NSF-funded DataLad project
2017-03-17 12:32:43 -04:00
yarikoptic
60ad846c5c fixing ben 2017-03-17 13:34:36 +00:00
yarikoptic
75f4900c66 added Ben 2017-03-17 13:33:48 +00:00
Joey Hess
6f082a3d56
bug report 2017-03-17 00:22:19 -04:00
yarikoptic
461649c49d 2017-03-17 03:10:59 +00:00
Joey Hess
32e0aebeb8
Merge branch 'master' of ssh://git-annex.branchable.com 2017-03-16 16:56:52 -04:00
rok
9cef6529cd Added a comment: v6 default behavior 2017-03-16 09:24:51 +00:00
kubaello@d561f15ff5c07a78b706b096375cd89d6d706066
30d1e5b861 Added a comment 2017-03-16 01:22:44 +00:00
kubaello@d561f15ff5c07a78b706b096375cd89d6d706066
19b6e333af 2017-03-16 01:00:55 +00:00
yarikoptic
1bdc63124f tuned up rushed report 2017-03-16 00:01:25 +00:00
yarikoptic
a7759f0898 2017-03-15 23:55:05 +00:00
Joey Hess
8dd3470da0
comment 2017-03-14 19:45:28 -04:00
https://launchpad.net/~stephane-gourichon-lpad
96b6d21d52 Added a comment: Isn't this procedure assuming that lost+found contains only uncorrupted previously annexed files? 2017-03-14 19:15:40 +00:00
Horus
5fd02cf20c Added a comment 2017-03-14 08:58:54 +00:00
ryan@d4f0c2d3daacb5ec3a2945bca06f66decad4bfb5
148b25c00d 2017-03-14 02:09:59 +00:00
Joey Hess
a20b0e0003
Merge branch 'master' of ssh://git-annex.branchable.com 2017-03-13 16:33:28 -04:00
Joey Hess
3d001276df
close; not a bug in git-annex 2017-03-13 16:32:12 -04:00
Joey Hess
d1ecdd04b2
Windows: Fix bug in shell script shebang lookup code that caused a "delayed read on closed handle" error.
The bug was that withFile closes the handle afterwards, but the content
of the file was not read due to laziness. Using readFile avoids it.

This commit was sponsored by Nick Daly on Patreon.
2017-03-13 16:20:52 -04:00
hobbie123
d489834369 Added a comment: windows password 2017-03-13 06:28:15 +00:00
lee@7614f42c1a6cc84dbc813df25d2f75ed54948e17
5d3e7aaa75 initial post 2017-03-12 17:59:12 +00:00
Michel
f585521ad0 Added a comment: Solution 2017-03-11 00:44:19 +00:00
CandyAngel
f68baf4ae6 Added a comment 2017-03-10 08:11:13 +00:00
Alan
9c7d71e4cb Added a comment: Issue still present 2017-03-10 07:32:16 +00:00
alanr
e62caf2e68 2017-03-10 03:21:16 +00:00
https://launchpad.net/~stephane-gourichon-lpad
1f16b41ec2 Added a comment: Work-in-progress, yet already usable, solution 2017-03-09 12:19:50 +00:00
jason.dixon.email@aa0e536a2ec2877d6f666108dbbc6e39bbe87ac0
ce4c549235 2017-03-09 12:08:07 +00:00
Michel
26d6653a33 Added a comment: Thanks 2017-03-09 07:34:25 +00:00
archimedes
5cb3ec901a Added a comment 2017-03-08 22:36:14 +00:00
archimedes
2255c842ca Added a comment 2017-03-08 22:34:59 +00:00
jason.dixon.email@aa0e536a2ec2877d6f666108dbbc6e39bbe87ac0
e9654cb053 Added a comment: re: comment 3 2017-03-08 21:58:14 +00:00
Joey Hess
5358fb992a
Windows: Improve handling of shebang in external special remote program, searching for the program in the PATH.
findShellCommand needs a full path to a file in order to check it for a
shebang on Windows. It was being run with only the base name of the external
special remote program, which would only work when it was in the current
directory.

This is why users in
https://github.com/DanielDent/git-annex-remote-rclone/pull/10 and elsewhere
were complaining that the previous improvements to git-annex didn't make
git-remote-rclone work on Windows.

Also, reworked checkearlytermination, which while it worked, seemed
to rely on a race condition. And, improved its error messages.

This commit was sponsored by Shane-o on Patreon.
2017-03-08 15:59:00 -04:00
Joey Hess
0d1a1838c5
comment 2017-03-08 15:30:32 -04:00
Joey Hess
3b1bbb8202
comment 2017-03-08 15:19:08 -04:00
Joey Hess
bcab98d299
Merge branch 'master' of ssh://git-annex.branchable.com 2017-03-08 14:50:06 -04:00
Joey Hess
fde5dbff2b
document get -J's behavior of spreading load amoung same-cost remotes
I implemented this last fall, but forgot to document it anywhere.
2017-03-08 14:26:29 -04:00
jason.dixon.email@aa0e536a2ec2877d6f666108dbbc6e39bbe87ac0
17932e07e1 Added a comment: Perhaps relevant 2017-03-08 17:31:30 +00:00
archimedes
fe2d33dbbd 2017-03-08 13:30:55 +00:00
jason.dixon.email@aa0e536a2ec2877d6f666108dbbc6e39bbe87ac0
1b3c15147f 2017-03-08 12:51:05 +00:00
jason.dixon.email@aa0e536a2ec2877d6f666108dbbc6e39bbe87ac0
83defc762f Added a comment: Oh and to be slightly helpful 2017-03-08 08:57:08 +00:00
jason.dixon.email@aa0e536a2ec2877d6f666108dbbc6e39bbe87ac0
98647f5959 Added a comment: Same issue with rclone on windows. 2017-03-08 08:55:49 +00:00
jason.dixon.email@aa0e536a2ec2877d6f666108dbbc6e39bbe87ac0
24ade8a25b Added a comment: Still seems useful 2017-03-07 10:19:41 +00:00
jason.dixon.email@aa0e536a2ec2877d6f666108dbbc6e39bbe87ac0
41b85ad1f4 Added a comment: I hope the option to show missing files remains. 2017-03-07 06:30:37 +00:00
Joey Hess
384027bc79
comment 2017-03-06 13:35:25 -04:00
Joey Hess
af2a6d578e
assistant: Add 1/200th second delay between checking each file in the full transfer scan, to avoid using too much CPU.
The slowdown is not going to be large in typical small-ish repos.
And it does not seem to matter if the assistant reacts a little bit slower
in situations involving the expensive scan, since:

a) Those situations typically involve getting back in sync after something
   has changed on a remote, often after a disconnect of some duration.
   So taking a few seconds more is not noticable.
b) If the scan finds things that it needs to do, it will start
   blocking anyway after 10 transfers are queued (due to use of
   queueTransferWhenSmall). So, only the speed of finding the first 10
   transfers will be impacted by this change.

This commit was sponsored by Jochen Bartl on Patreon.
2017-03-06 13:32:47 -04:00
Joey Hess
113b48ba19
comment 2017-03-06 12:56:08 -04:00
Joey Hess
ce91e4102e
response
This commit was sponsored by Thom May on Patreon.
2017-03-06 12:24:00 -04:00
Joey Hess
1e7c68500e
Merge branch 'master' of ssh://git-annex.branchable.com 2017-03-06 11:45:47 -04:00
benjamin.poldrack@d09ccff6d42dd20277610b59867cf7462927b8e3
0b18df0b28 Added a comment 2017-03-06 09:03:56 +00:00
Marco
fee30ecf6b 2017-03-04 12:55:17 +00:00
Joey Hess
eb2db2b176
comment 2017-03-03 13:59:49 -04:00
mbroadhead
624f3e1548 Added a comment 2017-03-03 16:59:52 +00:00
jason.dixon.email@aa0e536a2ec2877d6f666108dbbc6e39bbe87ac0
86508537c5 Added a comment: Does this not work counter to locking / unlocking files? 2017-03-03 13:40:06 +00:00
xloem
afc65319af removed 2017-03-03 12:32:35 +00:00
xloem
52545b73be Added a comment: Non-conforming blobs 2017-03-03 12:30:35 +00:00
xloem
b7eff4a34d Added a comment: Non-conforming blobs 2017-03-03 12:29:52 +00:00
mbroadhead
9b5763527b Added a comment 2017-03-02 22:48:09 +00:00
Joey Hess
9467cfa9bc
Merge branch 'master' of ssh://git-annex.branchable.com 2017-03-02 17:41:16 -04:00
Joey Hess
11d3219985
Linux standalone builds put the bundled ssh last in PATH, so any system ssh will be preferred over it.
This commit was sponsored by Denis Dzyubenko on Patreon.
2017-03-02 17:40:40 -04:00
kevang
f107487c62 2017-03-02 21:38:25 +00:00
Joey Hess
d797f750e4
comment 2017-03-02 17:28:43 -04:00
Joey Hess
1e31a7c93a
show how this is not specific to git-annex at all 2017-03-02 17:24:49 -04:00
Joey Hess
551848babd
Merge branch 'master' of ssh://git-annex.branchable.com 2017-03-02 17:19:44 -04:00
Joey Hess
0157cd9331
update 2017-03-02 16:39:31 -04:00
mbroadhead
b35a50ccab 2017-03-02 18:51:38 +00:00
Joey Hess
874232f1a6
status: Propigate nonzero exit code from git status. 2017-03-02 14:09:42 -04:00
Joey Hess
e4bcfcb618
comment 2017-03-02 14:04:15 -04:00
Joey Hess
1e9e96fa40
followup 2017-03-02 14:00:55 -04:00
Joey Hess
1cd5fc302c
fix format 2017-03-02 13:49:13 -04:00
Joey Hess
701006bd83
clarification 2017-03-02 13:28:31 -04:00
Joey Hess
fe28cbcd9e
comment 2017-03-02 13:23:27 -04:00
Joey Hess
8c1eda75b5
title 2017-03-02 13:20:17 -04:00
Joey Hess
995f58a04c
Merge branch 'master' of ssh://git-annex.branchable.com 2017-03-02 13:19:13 -04:00
Joey Hess
e83a2a2691
comment 2017-03-02 13:18:37 -04:00
git-annex@31849d241f10c295b30a9707352ae5c7d743adb7
2468e69354 Added a comment 2017-03-02 16:16:05 +00:00
git-annex@31849d241f10c295b30a9707352ae5c7d743adb7
273decc078 removed 2017-03-02 16:15:44 +00:00
git-annex@31849d241f10c295b30a9707352ae5c7d743adb7
fcdc72f807 Added a comment 2017-03-02 16:14:52 +00:00
Michel
6e6a90805d 2017-03-02 09:20:15 +00:00
Joey Hess
e3a03af24e
github mirror has been removed due to their horrible new anti-free-software TOS 2017-03-01 13:28:02 -04:00
Joey Hess
463dda3879
add news item for git-annex 6.20170301.1 2017-03-01 12:51:18 -04:00
Joey Hess
bd5b277c11
add news item for git-annex 6.20170301 2017-03-01 12:10:20 -04:00
yarikoptic
bc768d96a9 initial whining 2017-03-01 14:34:35 +00:00
dvicory
e4642a2452 Added a comment: Security of P2P repo is unclear 2017-02-28 20:30:31 +00:00
Joey Hess
739aa3a38e
add news item for git-annex 6.20170228 2017-02-28 14:42:28 -04:00
zpeters
a21c1ddbe6 Added a comment: RE: choosing remotes and annex-cost-command 2017-02-28 01:10:05 +00:00
Joey Hess
2c281baf00
better headings 2017-02-27 16:18:20 -04:00
Joey Hess
3f876f72e3
larger headings 2017-02-27 16:17:19 -04:00
Joey Hess
b78703ca4e
devblog 2017-02-27 16:11:35 -04:00
Joey Hess
e53070c1ff
inheritable annex.securehashesonly
* init: When annex.securehashesonly has been set with git-annex config,
  copy that value to the annex.securehashesonly git config.
* config --set: As well as setting value in git-annex branch,
  set local gitconfig. This is needed especially for
  annex.securehashesonly, which is read only from local gitconfig and not
  the git-annex branch.

doc/todo/sha1_collision_embedding_in_git-annex_keys.mdwn has the
rationalle for doing it this way. There's no perfect solution; this
seems to be the least-bad one.

This commit was supported by the NSF-funded DataLad project.
2017-02-27 16:08:23 -04:00
Joey Hess
6e0e7d885c
update 2017-02-27 15:32:04 -04:00
Joey Hess
49114cf4ea
securehash matching
Added --securehash option to match files using a secure hash function, and
corresponding securehash preferred content expression.

This commit was sponsored by Ethan Aubin.
2017-02-27 15:02:44 -04:00
Joey Hess
942e0174b3
make fsck check annex.securehashesonly, and new tip for working around SHA1 collisions with git-annex
This commit was sponsored by andrea rota.
2017-02-27 13:55:15 -04:00
Joey Hess
5e24e3ffe7
Merge branch 'master' of ssh://git-annex.branchable.com 2017-02-26 14:55:11 -04:00
michalrus
b4f7979391 Added a comment 2017-02-26 00:59:21 +00:00
openmedi
9bb93e2129 Added a comment 2017-02-25 20:35:53 +00:00
Joey Hess
e8bf942dc4
move thoughts 2017-02-25 15:00:22 -04:00
michalrus
03826e9759 2017-02-25 18:53:27 +00:00
Joey Hess
a463ba6e8a
more thoughts 2017-02-25 14:49:44 -04:00
michalrus
5fb21f1260 Added a comment 2017-02-25 18:47:36 +00:00
Joey Hess
d512098cbb
further thoughts 2017-02-25 12:55:38 -04:00
Joey Hess
622b3fface
devblog 2017-02-24 20:03:36 -04:00
Joey Hess
6b52fcbb7e
SHA1 collisions in key names was more exploitable than I thought
Yesterday's SHA1 collision attack could be used to generate eg:

SHA256-sfoo--whatever.good
SHA256-sfoo--whatever.bad

Such that they collide. A repository with the good one could have the
bad one swapped in and signed commits would still verify.

I've already mitigated this.
2017-02-24 19:54:36 -04:00