Commit graph

44012 commits

Author SHA1 Message Date
Joey Hess
30a81d4644
remove incorrect documentation of annex.skipunknown behavior
git-annex get with no parameters and annex.skipunknown = false
in a directory with no files tracked by git results in the same
failure as with a "." parameter.

It may be that git ls-files --error-unmatch changed behavior? Or this
was just wrong.
2023-09-13 12:57:24 -04:00
Joey Hess
9db90bab57
Merge branch 'master' of ssh://git-annex.branchable.com 2023-09-12 12:50:35 -04:00
Joey Hess
a18e40bdd7
lookupkey: Added --ref option
Sponsored-by: Joshua Antonishen on Patreon
2023-09-12 12:49:11 -04:00
jstritch
d12af0db78 Added a comment 2023-09-12 16:36:26 +00:00
anarcat
22bf65b875 Added a comment: just show start time? 2023-09-12 15:51:22 +00:00
Joey Hess
7be8950138
propigateAdjustedCommits in seekExportContent
push: When on an adjusted branch, propagate changes to parent branch before
updating export remotes.

This is a somewhat redundant call to propigateAdjustedCommits, since it
also gets called at pushLocal time. That other one needs to come after
importing from importtree remotes though, and seekExportContent has to come
earlier, so I don't see a way to avoid doing it twice.

Note that git-annex sync also manages to avoid the problem, it's only
git-annex push that had the bug.

Sponsored-by: Leon Schuermann on Patreon
2023-09-11 14:54:26 -04:00
Joey Hess
aeaadb8eb8
improve warning message when unable to update export
A misleading message was displayed in several cases.

If the user has run eg: git config
remote.push-win-remote.annex-tracking-branch 'adjusted/main(unlocked)'
That is not supported, and now it will tell them it's not a valid
configuration. A user reported doing that, but I don't know if it's a
common point of confusion. If it is a common problem, a better message
would be possible, or it could convert back from the adjusted branch to
the actual branch.

Sponsored-by: Graham Spencer on Patreon
2023-09-11 14:21:36 -04:00
Joey Hess
f3e5fc6d89
comment (and close) 2023-09-11 13:19:55 -04:00
Joey Hess
ec63bab79b
comment 2023-09-11 13:15:56 -04:00
Joey Hess
01e952a506
add link 2023-09-11 13:15:37 -04:00
Joey Hess
b314d8f73f
Merge branch 'master' of ssh://git-annex.branchable.com 2023-09-11 13:14:38 -04:00
Joey Hess
29ae536637
adb send to final filename not tmp file
Avoids some problems with unusual character in exporttree filenames
that confuse adb shell commands.

In particular, with a filename that contains \351, adb push sends the file
to the correct filename in /sdcard. And running find on the android device
roundtrips the filename. But, running mv on that filename on the android
device fails with "bad <filename>: No such file or directory".
Interestingly, ls on android works, and rm fails.

adb push to the final name to avoids this problem. But what about
atomicity? Well, I tried an adb push and interrupted it part way through.
The file was present while the push was running, but was removed once the
push got interrupted. I also tried yanking the cable while adb push was
running, and the partially received file was also deleted then. That avoids
most problems.

An import that runs at the same time as an export will see the partially
sent file. But that is unlikely to be done, and if it did happen, it would
notice that the imported file had changed in the meantime and discard it.

Note that, since rm on the android device fails on these filenames,
exporting a tree where the file is deleted is going to fail to remove it. I
don't see what I can do about that, so long as android is using an rm that
has issues with filename encodings.

This was tested on a phone where find, ls, and rm all come from Toybox 0.8.6.

Sponsored-by: unqueued on Patreon
2023-09-11 13:13:05 -04:00
jstritch
bd2e565592 2023-09-10 15:56:21 +00:00
jstritch
826918fb05 Added a comment: git annex pull is also broken 2023-09-09 14:49:35 +00:00
jstritch
c7346c2c47 2023-09-08 15:56:59 +00:00
matrss
790befd893 Added a comment: get file by branch and path in bare repository 2023-09-08 15:47:16 +00:00
Joey Hess
ecb9fb3b70
comment 2023-09-07 15:07:41 -04:00
Joey Hess
baf8e4f6ed
Override safe.bareRepository for git remotes
Fix using git remotes that are bare when git is configured
with safe.bareRepository = explicit

Sponsored-by: Dartmouth College's DANDI project
2023-09-07 14:56:26 -04:00
Joey Hess
cbfd214993
set safe.directory when getting config for git-annex-shell or git remotes
Fix more breakage caused by git's fix for CVE-2022-24765, this time
involving a remote (either local or ssh) that is a repository not owned by
the current user.

Sponsored-by: Dartmouth College's DANDI project
2023-09-07 14:40:50 -04:00
Joey Hess
32cb2bd3fa
Fix linker optimisation in linux standalone tarballs
Was only symlinking when there is a usr/ directory, but with usr/ merge,
there are none.

Sponsored-by: Dartmouth College's Datalad project
2023-09-07 12:59:27 -04:00
Joey Hess
9563830529
tag datalad 2023-09-07 12:57:38 -04:00
yarikoptic
70e766c95b Added a comment 2023-08-31 16:48:34 +00:00
yarikoptic
4d165518c3 original report on misleading reasons stated by enableremote for the need of safe.directory case 2023-08-31 15:58:52 +00:00
yarikoptic
07abfc3075 Added a comment 2023-08-31 13:57:21 +00:00
yarikoptic
c6f6b993bc reporting on increased number of looksup 2023-08-31 13:54:20 +00:00
gitannex@fe613c61745e9d1e7f6df5e24a666828bb5682cc
86c70833a1 Added a comment 2023-08-31 01:56:30 +00:00
gitannex@fe613c61745e9d1e7f6df5e24a666828bb5682cc
578f24b632 2023-08-31 01:44:23 +00:00
gitannex@fe613c61745e9d1e7f6df5e24a666828bb5682cc
2837c63282 2023-08-31 01:40:02 +00:00
gitannex@fe613c61745e9d1e7f6df5e24a666828bb5682cc
e67050b8d3 2023-08-31 01:34:23 +00:00
Joey Hess
50300a47fe
Removed the vendored git-lfs and the GitLfs build flag
AFAICS all git-annex builds are using the git-lfs library not the vendored
copy.

Debian stable now includes a new enough haskell-git-lfs package as well.
Last time this was tried it did not.
2023-08-28 13:12:31 -04:00
Joey Hess
d3796248ea
add news item for git-annex 10.20230828 2023-08-28 13:04:20 -04:00
Joey Hess
a0a42e7ec1
releasing package git-annex version 10.20230828 2023-08-28 13:04:06 -04:00
Joey Hess
5e818e4903
remove man pages from cabal file
Since 393275c105 Setup.hs no longer
installs the man pages. Since the cabal package is only used to install
git-annex with cabal, it doesn't need to include files like these that
are not used when installing with cabal.
2023-08-28 12:57:50 -04:00
Joey Hess
0cc184f044
better link to install stack
and a layout fix
2023-08-28 12:52:53 -04:00
Joey Hess
92672662c7
remove unused import 2023-08-28 12:35:57 -04:00
Joey Hess
8e6eaad590
remove dead code 2023-08-28 12:34:24 -04:00
Joey Hess
70acc8864d
comment 2023-08-28 12:20:49 -04:00
Joey Hess
43e2a66a31
wording 2023-08-28 12:13:58 -04:00
derphysiker
b2887edc96 2023-08-27 07:38:44 +00:00
Joey Hess
49b97b0675
oldkeys: check associated files by default and add --unchecked
Removed the prior code that checked for keys used by current versions of
the files being acted on. It is redundant with the associated files
check (so long as the associated files database is always up-to-date,
which reconcileStaged should accomplish).

Sponsored-by: Luke T. Shumaker on Patreon
2023-08-23 13:46:41 -04:00
Joey Hess
1e580a30be
comment (and a new example) 2023-08-22 15:10:04 -04:00
Joey Hess
47f92409f2
Merge branch 'master' of ssh://git-annex.branchable.com 2023-08-22 15:01:43 -04:00
Joey Hess
5489c2cdd6
oldkeys --revision-range
Sponsored-by: Brett Eisenberg on Patreon
2023-08-22 15:00:29 -04:00
Joey Hess
cf8b30c914
oldkeys: New command that lists the keys used by old versions of a file
The tricky thing about this turned out to be handling renames and reverts.
For that, it has to make two passes over the git log, and to avoid
buffering a possibly huge amount of logs in memory (ie the whole git log of
an entire repository!), runs git log twice.

(It might be possible to speed this up by asking git log to show a diff,
and so avoid needing to use catKey.)

Sponsored-By: Brock Spratlen on Patreon
2023-08-22 14:51:06 -04:00
nobodyinperson
1afa7dcf44 Added a comment 2023-08-22 17:57:45 +00:00
nobodyinperson
42683457d0 Added a comment: Oh yes please 🤩 2023-08-22 16:48:58 +00:00
Joey Hess
6115bced71
comment, todo 2023-08-22 12:38:00 -04:00
Joey Hess
80be770041
comment 2023-08-22 12:21:17 -04:00
Joey Hess
d4ca85fd23
comment 2023-08-22 12:10:46 -04:00
Joey Hess
379d58b499
diffdriver: Added --get option
Removed the dontCheck repoExists, because running it in a repo that has not
been initialized yet would update location log with nouuid. And I guess
it's ok for it to only support running in git-annex repos.
2023-08-22 11:58:53 -04:00