Commit graph

12646 commits

Author SHA1 Message Date
Joey Hess
0f36cd1613
fixed 2025-08-20 13:36:39 -04:00
Joey Hess
fd89e611b2
error out when another branch has been manually merged into the adjusted branch
This avoids losing the merge commit when re-running git-annex adjust in the
adjusted branch.

It also makes git-annex sync error out, rather than displaying a warning
and exiting successfully.

Sponsored-by: Leon Schuermann on Patreon
2025-08-20 13:28:03 -04:00
Joey Hess
16463f8f02
Merge branch 'master' of ssh://git-annex.branchable.com 2025-08-20 12:31:35 -04:00
jcjgraf
9d1f47a45b Added a comment: Reproduce Issue 2025-08-18 19:02:35 +00:00
Joey Hess
8991c75d04
bug 2025-08-15 18:11:19 -04:00
Joey Hess
0b388c0924
warn and refuse to autoenable a special remote when name is in use
Improve behavior when there are special remotes configured with
autoenable=yes with names that conflict with other remotes.

The use of remoteList' is to avoid using the cached remote list in the case
where there are two special remotes both configured to autoenable and both
with the same name. Once the 1st is autoenabled, this makes reload the
remote list and so see the 1st, and so refuse to autoenable the second.

This adds a little bit of overhead, but it should be sufficiently small not
to need optimising.

Sponsored-by: Dartmouth College's OpenNeuro project
2025-08-14 11:05:42 -04:00
Joey Hess
5323e0c20b
followup 2025-08-14 10:15:29 -04:00
Joey Hess
b5808c6413
close 2025-08-14 09:56:15 -04:00
Joey Hess
7e3a176f0c
close 2025-08-13 15:33:39 -04:00
Joey Hess
3b1702e658
probe AWS datacenter
S3: When initremote is given the name of a bucket that already exists,
automatically set datacenter to the right value, rather than needing it to
be explicitly set.

This needs aws-0.23. But, initremote stores the datacenter value, so
a remote set up this way can be used with git-annex built with an older aws.

This is not done when signature=anonymous, because in that case,
using AWS.defaultRegion works fine for accessing buckets on other
datacenters.

It feels a bit round-about to need to do this probing. But without it,
the problem seems to be that, with a v4 signature, the location constraint
is included in the Authorization header. When that is the wrong location,
AWS S3 rejects it. I do wonder though if there is an easier way that I
am currently missing.

Sponsored-by: Dartmouth College's DANDI project
2025-08-13 15:23:31 -04:00
Joey Hess
215640096f
S3: Default to signature=v4 when using an AWS endpoint
* S3: Default to signature=v4 when using an AWS endpoint, since some
  AWS regions need v4 and all support it. When host= is used to specify
  a different S3 host, the default remains signature=v2.
* webapp: Support setting up S3 buckets in regions that need v4
  signatures.

For the webapp, went ahead and added all current S3 regions
(except govcloud, which  is not usable by everyone).

Sponsored-by: Dartmouth College's DANDI project
2025-08-13 13:18:35 -04:00
Joey Hess
ebf0bfe6d8
comment 2025-08-13 12:50:05 -04:00
Michael
330c0af0de 2025-08-11 03:37:34 +00:00
yarikoptic
6578d323a1 Added a comment 2025-07-31 19:07:57 +00:00
mih
0de42855c5 Added a comment: Works! 2025-07-22 13:31:21 +00:00
Joey Hess
cf449837ea
run reconcileStaged even in smudge clean filter, using alternate code path
Improved workaround for git 2.50 bug, avoding an occasional test suite
failure, as well as some situations where an unlocked file did not get
populated when adding another file to the repository with the same content.

This uses the alternate code path that was already using when there was
a conflict. Since that code path is not able to record its work,
it will redo the same work next time. If the only way reconcileStaged
is getting run is via the smudge clean filter, that could result in
more and more changes getting processed redundantly each time. Once
some other git-annex command runs and calls reconcileStaged, it
will stop redoing that work. I don't think the extra work will be a
problem.
2025-07-21 14:10:49 -04:00
Joey Hess
f4fdab0ffa
fixed build failure 2025-07-21 12:27:39 -04:00
mih
c58aa2cf47 Added a comment: Thanks! 2025-07-17 06:58:01 +00:00
Joey Hess
758515dc9a
fsck: Fix location of annexed files when run in linked worktrees
This cleans up after the bug that was fixed in commit
6a9e923c74
Object files that were stored in the wrong location are rescued,
and after that any wrong location logs will be fixed by the usual fsck.
2025-07-15 13:09:45 -04:00
Joey Hess
313d1b10fa
tag INM7
Based on submitter, I assume so..
2025-07-14 15:06:39 -04:00
Joey Hess
addcd389ff
fixed but not ready to close yet 2025-07-14 13:36:17 -04:00
Joey Hess
5c34edc35c
subtlety 2025-07-11 15:55:50 -04:00
Joey Hess
3fba7910d2
complication 2025-07-11 14:46:36 -04:00
Joey Hess
ce1c47b658
analysis 2025-07-11 14:35:47 -04:00
Joey Hess
cedbf88c82
update 2025-07-11 12:50:25 -04:00
Joey Hess
2df204b411
another case 2025-07-11 12:42:22 -04:00
Joey Hess
93eb7864c8
reproed 2025-07-11 12:16:25 -04:00
gioele@678b7c03f524f2669b179b603f65352fcc16774e
072f2606a1 Added a comment 2025-07-09 19:36:24 +00:00
mih
98b7cf3ac4 Bug report with reproducer 2025-07-08 10:51:19 +00:00
Basile.Pinsard
fab100e0c9 2025-07-03 14:37:14 +00:00
Basile.Pinsard
e1587840ae 2025-07-03 14:32:10 +00:00
Joey Hess
d5d0291de7
close bug that I fixed before it was filed 2025-06-30 10:01:43 -04:00
Joey Hess
faf304b2f4
comment 2025-06-30 09:58:04 -04:00
Joey Hess
0d67b6ec31
close dup 2025-06-30 09:56:11 -04:00
matrss
a35997b8dd Added a comment 2025-06-27 07:11:59 +00:00
matrss
2466d02701 2025-06-26 15:24:32 +00:00
yarikoptic
18953f341c 2025-06-25 23:59:20 +00:00
Joey Hess
fb155b1e3e
Work around git 2.50 bug that caused it to crash when there is a merge conflict with an unlocked annexed file
This fixes several test suite failures with git 2.50.

See the bug report for the full, gory details.
2025-06-25 13:36:23 -04:00
Joey Hess
64263a8410
bug 2025-06-25 11:41:56 -04:00
xentac
ce99131e8e Added a comment 2025-06-24 20:54:16 +00:00
Joey Hess
efbadc2397
comment 2025-06-24 11:13:02 -04:00
xentac
136cfff510 Added a comment 2025-06-23 18:24:47 +00:00
Joey Hess
bd741cc128
comment 2025-06-23 13:31:41 -04:00
Joey Hess
2007507e2b
prevent relatedTemplate from truncating a filename to end in whitespace
Avoid a problem with temp file names ending in whitespace on filesystems
like VFAT that don't support such filenames.

See a6eb7d7339 previously for the same but
with "."

At some point relatedTemplate is more bother than it's worth and it would
be simpler to just use "temp" as the basename of all temp files. We seem to
be approaching that point, since my interest in absurd ancient filesystem
limitations is limited.

Sponsored-by: unqueued on Patreon
2025-06-23 13:31:15 -04:00
Joey Hess
6818e69b81
Skip and warn when a tree import includes empty filenames
Which can happen with eg a S3 bucket.

Sponsored-by: Dartmouth College's DANDI project
2025-06-23 11:12:44 -04:00
Joey Hess
0f4531e9a7
response 2025-06-23 10:30:00 -04:00
Joey Hess
7b88bc4970
not a bug in git-annex 2025-06-23 10:18:16 -04:00
xentac
a6ca0a4664 Added a comment 2025-06-23 08:50:15 +00:00
xentac
880004aefd 2025-06-23 08:48:28 +00:00
yarikoptic
6c95fd004a Added a comment 2025-06-22 03:53:19 +00:00