Commit graph

11353 commits

Author SHA1 Message Date
Joey Hess
697e22cceb
fixed 2022-07-05 16:35:19 -04:00
Joey Hess
201e41cffd
add: Fix reversion when adding an annex link that has been moved to another directory
Fixes commit f259be7f39

Sponsored-by: Dartmouth College's Datalad project
2022-07-05 16:22:41 -04:00
Joey Hess
149d12f188
support --backend again in addurl and importfeed
Missed these two when converting from a global option.

Sponsored-by: Dartmouth College's Datalad project
2022-07-05 15:35:43 -04:00
yarikoptic
e355c22629 Added a comment: mystery resolved 2022-07-01 19:19:30 +00:00
yarikoptic
cd1c07bc4c initial report on move bug 2022-07-01 13:45:02 +00:00
Soxofaan
65ba22ae5c Added a comment: no worries 2022-06-30 16:51:51 +00:00
yarikoptic
dac8c76d0c asking to return --backend for addurl 2022-06-30 15:00:19 +00:00
yarikoptic
c0f86a1009 FTBFS report on linux 2022-06-30 14:52:24 +00:00
contr-error
c17a4476f9 marking as done 2022-06-29 19:14:38 +00:00
contr-error
281f116c6a Added a comment 2022-06-29 19:13:56 +00:00
Joey Hess
ad34d7996d
close bug that was recently fixed 2022-06-29 14:51:11 -04:00
Joey Hess
0184fef516
close 2022-06-29 14:44:02 -04:00
Joey Hess
834b4e5012
close 2022-06-29 14:42:40 -04:00
Joey Hess
43814314ae
close 2022-06-29 14:41:34 -04:00
Joey Hess
42c5d9631d
close 2022-06-29 14:39:21 -04:00
Joey Hess
dd4c110f3c
close 2022-06-29 14:38:16 -04:00
Joey Hess
82063e20c7
close 2022-06-29 14:37:02 -04:00
Joey Hess
cddcabfbb5
include filename in fsck warning
So it's available in --quiet mode. The same was already done in other
fsck warnings.

Sponsored-by: Noam Kremen on Patreon
2022-06-29 14:33:35 -04:00
Joey Hess
4b4795ec85
this is fixed 2022-06-29 14:30:57 -04:00
Joey Hess
4a17981196
close 2022-06-29 14:29:00 -04:00
Joey Hess
a6e332fd51
close 2022-06-29 14:27:44 -04:00
Joey Hess
02ef3d6a64
fix build with assistant disabled and webapp enabled
The webapp modules cannot build with the assistant disabled, so make the
webapp be under the assistant build flag.

Sponsored-by: Jarkko Kniivilä on Patreon
2022-06-29 14:19:18 -04:00
Joey Hess
46faf74d90
close 2022-06-29 13:45:33 -04:00
Joey Hess
7f1d556d13
close 2022-06-29 13:38:46 -04:00
Joey Hess
b223988e22
remove --backend from global options
--backend is no longer a global option, and is only accepted by commands
that actually need it.

Three commands that used to support backend but don't any longer are
watch, webapp, and assistant. It would be possible to make them support it,
but I doubt anyone used the option with these. And in the case of webapp
and assistant, the option was handled inconsistently, only taking affect
when the command is run with an existing git-annex repo, not when it
creates a new one.

Also, renamed GlobalOption etc to AnnexOption. Because there are many
options of this type that are not actually global (any more) and get
added to commands that need them.

Sponsored-by: Kevin Mueller on Patreon
2022-06-29 13:33:25 -04:00
Joey Hess
3eecf2033a
update 2022-06-29 12:51:01 -04:00
Joey Hess
2a009bf14e
close 2022-06-29 12:43:30 -04:00
Joey Hess
21c50c0f72
fix parallel copy from/to a local git repo
Improve handling of parallelization with -J when copying content from/to a
git remote that is a local path.

Sponsored-by: Nicholas Golder-Manning on Patreon
2022-06-29 12:40:12 -04:00
Joey Hess
54baa480b6
close mistaken bug report 2022-06-29 12:26:36 -04:00
Joey Hess
ae6c54cc0e
wontfix 2022-06-29 12:24:25 -04:00
Joey Hess
58e7869e35
retitle 2022-06-29 12:19:08 -04:00
Joey Hess
e1aa96ac21
fix my comment format 2022-06-29 12:18:28 -04:00
Joey Hess
d7771a6cdc
comment 2022-06-29 12:17:42 -04:00
Joey Hess
d78cb5e5cc
comment and retitle 2022-06-28 12:35:08 -04:00
Joey Hess
a9c531b867
Merge branch 'master' of ssh://git-annex.branchable.com 2022-06-28 12:28:57 -04:00
Joey Hess
a0a0ec51dd
comment 2022-06-28 12:27:48 -04:00
contr-error
14c113fe0e add bug 2022-06-28 10:03:57 +00:00
Soxofaan
6a58fd3626 Added a comment: Same problem 2022-06-26 21:53:39 +00:00
Joey Hess
e5c418b99c
convert bug to todo 2022-06-22 14:23:46 -04:00
Joey Hess
af1a45c69c
use replaceWorkTreeFile when fixing an annex symlink
This does not change any behavior, but it's useful for all worktree
changes to be made using this.

Sponsored-by: Graham Spencer on Patreon
2022-06-22 13:41:41 -04:00
Joey Hess
cfc65ee9fc
followup 2022-06-22 13:19:35 -04:00
Joey Hess
1ddaf7a27f
decided this is not a problem 2022-06-15 14:00:56 -04:00
Joey Hess
f259be7f39
fix overwrite race with small file that got large
When adding a small file, it does not get locked down, so can be modified
after git-annex checks that it's small. The use of queued git add made the
race window nice and wide too.

Fixed by checking if the file has changed, and by not using git add.
Instead, have to recapitulate git add's handling of things like symlinks
and executable files.

Sponsored-by: Jochen Bartl on Patreon
2022-06-14 16:38:56 -04:00
Joey Hess
56e095aaf4
Merge branch 'master' of ssh://git-annex.branchable.com 2022-06-14 14:56:16 -04:00
yarikoptic
60a02af856 Added a comment: hold it... ;) 2022-06-14 18:47:25 +00:00
Joey Hess
78a3d44ea0
get rid of racy addLink
The remaining callers all did not rely on it checking gitignore, so were
easy to convert.

They were susceptable to the same overwrite race as add and fix,
although less likely to have it and a narrower window than add's race.

Command.Rekey in passing got an unncessary call to removeFile deleted.
addSymlink handles deleting any existing worktree file.
2022-06-14 14:47:15 -04:00
Joey Hess
e47219bcb5
bug report 2022-06-14 14:13:48 -04:00
Joey Hess
dd6dec4eb1
fix add overwrite race with git-annex add to annex
This is not a complete fix for all such races, only the one where a
large file gets changed while adding and gets added to git rather than
to the annex.

addLink needs to go away, any caller of it is probably subject to the
same kind of race. (Also, addLink itself fails to check gitignore when
symlinks are not supported.)

ingestAdd no longer checks gitignore. (It didn't check it consistently
before either, since there were cases where it did not run git add!)
When git-annex import calls it, it's already checked gitignore itself
earlier. When git-annex add calls it, it's usually on files found
by withFilesNotInGit, which handles checking ignores.

There was one other case, when git-annex add --batch calls it. In that
case, old git-annex behaved rather badly, it would seem to add the file,
but git add would later fail, leaving the file as an unstaged annex symlink.
That behavior has also been fixed.

Sponsored-by: Brett Eisenberg on Patreon
2022-06-14 13:37:19 -04:00
Joey Hess
b471438c51
bug report
Sponsored-by: Luke Shumaker on Patreon
2022-06-14 12:51:09 -04:00
Joey Hess
b9e9ad1ffb
comment 2022-06-14 12:23:33 -04:00