Commit graph

39970 commits

Author SHA1 Message Date
Joey Hess
b184fc490a
split out common options to its own page and mention it on each subcommand page
Sometimes users would get confused because an option they were looking
for was not mentioned on a subcommand's man page, and they had not
noticed that the main git-annex man page had a list of common options.
This change lets each subcommand mention the common options, similarly
to how the matching options are handled.

This commit was sponsored by Svenne Krap on Patreon.
2021-05-10 15:00:13 -04:00
Joey Hess
8ab04788ef
comment 2021-05-10 14:43:37 -04:00
Joey Hess
8e756a6ec0
add test cases for git/annexed conversions
Make sure that tip keeps working.

I tried to go futher and touch the file and make sure it stayed what it
was converted to, but struggled with some weird and not entirely
reproducable behavior, so kept the tests simple for now.
2021-05-10 14:29:57 -04:00
erics
7592abcd5e 2021-05-10 17:58:51 +00:00
Joey Hess
675556fd9a
smudge: check for known annexed inodes before checking annex.largefiles
smudge: Fix a case where an unlocked annexed file that annex.largefiles
does not match could get its unchanged content checked into git, due to git
running the smudge filter unecessarily.

When the file has the same inodecache as an already annexed file,
we can assume that the user is not intending to change how it's stored in
git.

Note that checkunchangedgitfile already handled the inverse case, where the
file was added to git previously. That goes further and actually sha1
hashes the new file and checks if it's the same hash in the index.

It would be possible to generate a key for the file and see if it's the
same as the old key, however that could be considerably more expensive than
sha1 of a small file is, and it is not necessary for the case I have, at
least, where the file is not modified or touched, and so its inode will
match the cache.

git-annex add was changed, when adding a small file, to remove the inode
cache for it. This is necessary to keep the recipe in
doc/tips/largefiles.mdwn for converting from annex to git working.
It also avoids bugs/case_where_using_pathspec_with_git-commit_leaves_s.mdwn
which the earlier try at this change introduced.
2021-05-10 13:20:10 -04:00
Joey Hess
c60b66d442
comment 2021-05-10 12:44:53 -04:00
Joey Hess
dc412c6d75
comment 2021-05-10 12:42:56 -04:00
Joey Hess
72a8bbce12
Revert "smudge: check for known annexed inodes before checking annex.largefiles"
This reverts commit 424bef6b6f.

This commit caused other buggy behavior unfortunately.
2021-05-10 12:20:13 -04:00
Joey Hess
56ccc0302e
mention --all on fsck man page, and repurpose todo 2021-05-10 11:11:50 -04:00
Joey Hess
c88fdd91f9
comment and close 2021-05-10 11:04:50 -04:00
Joey Hess
9cc8e24727
comment 2021-05-10 10:48:44 -04:00
Joey Hess
0ab9d0dfad
comment 2021-05-10 10:37:28 -04:00
Atemu
c09497dfad Added a comment 2021-05-10 14:13:55 +00:00
Lukey
c2b1c730a5 Added a comment 2021-05-10 12:21:37 +00:00
Atemu
689a26d25a 2021-05-10 11:01:43 +00:00
Atemu
f0b553a25a 2021-05-10 10:53:12 +00:00
Atemu
3dc9833d53 2021-05-10 10:26:45 +00:00
Joey Hess
e53bd0c6c0
user error, not a bug 2021-05-09 20:58:35 -04:00
Joey Hess
a8e8ad95a2
bug report 2021-05-09 20:55:07 -04:00
strmd
402a06c515 Added a comment 2021-05-07 20:00:08 +00:00
kyle
5a5ef1c869 Added a comment: thanks 2021-05-07 18:07:24 +00:00
Joey Hess
921753ac44
reinject: Error out when run on a file that is not annexed
rather than silently skipping it
2021-05-07 13:31:03 -04:00
Joey Hess
4bf7940d6b
fileRef: make paths relative and simplified
Fix behavior of several commands, including reinject, addurl, and rmurl
when given an absolute path to an unlocked file, or a relative path that
leaves and re-enters the repository.

To avoid slowing down all the cases where the paths are already ok
with an unncessary call to getCurrentDirectory, put in an optimisation
in relPathCwdToFile. That will probably also speed up other parts of
git-annex by some small amount, but I have not benchmarked.

Note that I did not convert branchFileRef, because it seems likely that
it will be used with a file that is not provided by the user, so is already
in a sane format. This is certainly true for the way git-annex uses it,
though maybe arguable to the extent Git.Ref is a reusable library.
2021-05-07 13:25:59 -04:00
Joey Hess
6b980c1514
comment 2021-05-07 13:13:48 -04:00
Joey Hess
73f330a62e
document an important property of relPathCwdToFile 2021-05-07 12:57:54 -04:00
Joey Hess
9e1a693f16
Merge branch 'master' of ssh://git-annex.branchable.com 2021-05-07 11:44:58 -04:00
Joey Hess
0caf171c63
patch review 2021-05-07 11:44:30 -04:00
Ilya_Shlyakhter
fd60824979 Added a comment: different keys for the same content 2021-05-07 15:37:46 +00:00
Joey Hess
51eb04a05c
remove now redundant -O0
That is now enabled by -f-Production, since commit
cab398c945
2021-05-07 11:25:34 -04:00
Joey Hess
1bd44c7742
Merge remote-tracking branch 'atemu/misc-fixes' 2021-05-07 11:23:54 -04:00
Joey Hess
eaea173bc2
applied patch 2021-05-07 11:11:10 -04:00
Kyle Meyer
4450fe3629
fromkey: create directory for pointer files too
fromkey creates leading directories for symbolic links.  Do the same
for pointer files.
2021-05-07 11:10:06 -04:00
Joey Hess
5332cf8a80
Merge branch 'master' of ssh://git-annex.branchable.com 2021-05-07 11:09:21 -04:00
kyle
cc36fd261e reinject: silent failure with absolute path to pointer file 2021-05-06 19:26:52 +00:00
kyle
06e996efad patch: fromkey: create directory for pointer files too 2021-05-06 15:23:07 +00:00
pat
dab2030702 Added a comment 2021-05-05 22:51:29 +00:00
Joey Hess
18f27dc60d
update 2021-05-05 17:30:35 -04:00
pat
f3ee163b8e Added a comment 2021-05-05 19:39:12 +00:00
pat
da5598da21 2021-05-05 19:06:19 +00:00
Lukey
49f9f696f1 Added a comment 2021-05-05 18:08:49 +00:00
https://esgf-node.llnl.gov/esgf-idp/openid/tom_clune
5d8ee97297 2021-05-05 16:31:32 +00:00
Atemu
e686a878ed 2021-05-05 08:52:28 +00:00
Atemu
4da2206148 Added a comment 2021-05-05 07:33:07 +00:00
Atemu
78948270e2 2021-05-05 06:11:51 +00:00
Atemu
931a55b9a4 Added a comment 2021-05-05 06:04:49 +00:00
Atemu
cab398c945 Cabal: Use -O0 for development builds
Can be configured with `--flags=-production`

Time for full build on my machine: 2m -> 45s
2021-05-05 07:53:52 +02:00
Atemu
857bffe388 Added a comment 2021-05-05 05:43:56 +00:00
pat
5bb85d76d8 2021-05-05 02:51:47 +00:00
kyle
8f0ddf0925 git-commit pathspec change due to 424bef6b6 2021-05-04 21:43:41 +00:00
cecile.madjar@d95f9e618c3dff4829e7fedba1a71e1499542f3f
e66b5344e8 Added a comment 2021-05-04 21:12:52 +00:00