Commit graph

12013 commits

Author SHA1 Message Date
Joey Hess
3f6c762a3d
comment 2023-08-08 13:43:04 -04:00
jkniiv
e9ad2d83f4 Added a comment 2023-08-08 16:38:53 +00:00
Joey Hess
6d83bcff0f
Fix behavior of onlyingroup
Sponsored-by: k0ld on Patreon
2023-08-07 13:05:11 -04:00
jkniiv
b4d1591283 report on --onlyingroup only partially working 2023-08-05 11:15:30 +00:00
Joey Hess
471ea17ae3
comment 2023-07-21 15:33:59 -04:00
Joey Hess
15f5a9b837
remove spam 2023-07-21 15:15:11 -04:00
Joey Hess
f7dc2511f7
comment 2023-07-21 15:14:36 -04:00
Joey Hess
b15366494a
directory: Remove empty hash directories when dropping content
Failure to remove is not treated as a problem, and no permissions
modifications are done, to avoid unexpected states.

Sponsored-by: Luke Shumaker on Patreon
2023-07-21 14:57:29 -04:00
Joey Hess
33ba537728
deal with Amazon S3 breaking change for public=yes
* S3: Amazon S3 buckets created after April 2023 do not support ACLs,
  so public=yes cannot be used with them. Existing buckets configured
  with public=yes will keep working.
* S3: Allow setting publicurl=yes without public=yes, to support
  buckets that are configured with a Bucket Policy that allows public
  access.

Sponsored-by: Joshua Antonishen on Patreon
2023-07-21 13:59:07 -04:00
Joey Hess
ddc7f36d53
comment 2023-07-21 13:01:46 -04:00
hipohaha
214907acef Added a comment: thank 2023-07-21 10:08:15 +00:00
tomdhunt
cdcb30464a 2023-07-19 02:49:48 +00:00
adina.wagner@2a4cac6443aada2bd2a329b8a33f4a7b87cc8eff
4b7362166b 2023-07-18 09:13:47 +00:00
nobodyinperson
bbff6dbb83 bug report 2023-07-17 10:56:08 +00:00
nobodyinperson
64edb19328 Added a comment 2023-07-17 06:12:27 +00:00
ewen
0dc8b03588 Added a comment: unspecified default preferred content = present 2023-07-17 00:50:09 +00:00
alex
f504781127 2023-07-16 06:51:33 +00:00
nobodyinperson
82ec9e5a5b Added a comment 2023-07-15 17:04:38 +00:00
Joey Hess
116b8affe5
comment 2023-07-15 12:28:32 -04:00
agot
4f85a6ac84 2023-07-14 19:14:34 +00:00
Joey Hess
b00200c73c
comment 2023-07-13 20:02:41 -04:00
ewen
1c0b53e838 Added a comment: git mv to temporary name, commit, git mv back, commit, can resolve duplicates 2023-07-13 01:12:34 +00:00
ewen
d1e87c49fc Added a comment 2023-07-13 00:54:35 +00:00
ewen
2469720e1e Added a comment: Plumbing commands vs Porcelain commands 2023-07-13 00:26:20 +00:00
Joey Hess
6a4dfb172d
Merge branch 'master' of ssh://git-annex.branchable.com 2023-07-12 13:55:10 -04:00
Joey Hess
bf496b16a4
comment 2023-07-12 13:54:59 -04:00
jkniiv
749b532e8f Added a comment 2023-07-12 17:30:52 +00:00
Joey Hess
b6314c0207
comment 2023-07-12 13:27:33 -04:00
jkniiv
b6c5b471b0 Added a comment 2023-07-12 16:25:49 +00:00
nobodyinperson
4ed5cfa812 Added a comment 2023-07-12 13:10:26 +00:00
ewen
98f1eb48ea Added a comment: Alternative proposal for better backwards compatibility 2023-07-12 12:48:04 +00:00
nobodyinperson
d030ed8eb9 Added a comment: There is already something like fullsync: git annex assist, suggestion: new metasync command 2023-07-12 11:15:26 +00:00
ewen
0386845605 Added a comment: Preferred content settings not really an alternative 2023-07-12 10:53:41 +00:00
ewen
0838e7a07f Added a comment: History of change 2023-07-12 10:27:43 +00:00
nobodyinperson
e4cb4ec3d2 Added a comment 2023-07-12 09:21:56 +00:00
jkniiv
1b8d5940bd Added a comment 2023-07-12 07:33:16 +00:00
jkniiv
12054cd7e2 Added a comment: I have to agree that this change to sync is annoying 2023-07-12 07:18:54 +00:00
ewen
d733b8ed04 Recommend accepting "list" output encoding of filename as input too 2023-07-12 06:54:05 +00:00
nobodyinperson
c001844dd3 Added a comment 2023-07-12 06:49:48 +00:00
ewen
6ed3ed7e57 Suggest using "git annex fullsync" to trigger a full sync, not changing "git annex sync" behaviour 2023-07-12 04:16:48 +00:00
Joey Hess
240bae38f6
sync: When in an adjusted branch, merge changes from the original branch
This causes changes to the original branch to get merged with a single
sync. Before, it took 2 syncs; the first happened to update the synced/
branch, and the second merged changes from the synced/ branch into the
ajusted branch.

Using mergeToAdjustedBranch when tomerge == origbranch is probably
overkill, but it does work fine.

Sponsored-By: the NIH-funded NICEMAN (ReproNim TR&D3) project
2023-07-06 12:42:24 -04:00
Joey Hess
adb09117f1
propigateAdjustedCommits: avoid overwriting diverged original branch
Bug fix: Re-running git-annex adjust or sync when in an adjusted branch
would overwrite the original branch, losing any commits that had been made
to it since the adjusted branch was created.

When git-annex adjust is run in this situation, it will display a warning
about the diverged branches.

When git-annex sync is run in this situation, mergeToAdjustedBranch
will merge the changes from the original branch to the adjusted branch.
So it does not need to display the divergence warning.

Note that for some reason, I'm needing to run sync twice for that to
happen. The first run does not do the merge and the second does. I'm unsure
why and so am not fully done with this bug.

Sponsored-By: the NIH-funded NICEMAN (ReproNim TR&D3) project
2023-07-05 17:09:49 -04:00
Joey Hess
a05bc6a314
Fix breakage when git is configured with safe.bareRepository = explicit
Running git config --list inside .git then fails, so better to only
do that when --git-dir was specified explicitly. Otherwise, when the
repository is not bare, run the command inside the working tree.

Also make init detect when the uuid it just set cannot be read and fail
with an error, in case git changes something that breaks this later.

I still don't actually understand why git-annex add/assist -J2 was
affected but -J1 was not. But I did show that it was skipping writing to
the location log, because the uuid was NoUUID.

Sponsored-by: Graham Spencer on Patreon
2023-07-05 14:43:14 -04:00
Joey Hess
321681cd1b
renamed bug 2023-07-05 14:09:21 -04:00
Joey Hess
9d2a7c4bb6
erk 2023-07-05 13:57:28 -04:00
Joey Hess
fe0e0c0523
also affects add 2023-07-05 13:42:52 -04:00
Joey Hess
3c1d18cb3b
assist: With --jobs, parallelize transferring content to/from remotes
Command.Add.seek starts concurrency with CommandStages. And for
Command.Sync, it needs TransferStages. So, to get both types of concurrency
for the two different parts, it either needs to change the type of
concurrency in between, or just call startConcurrency once for each.

It seems safe enough to call startConcurrency twice, because it does shut
down concurrency (mostly) at the end, and eg the old Annex.workers get
emptied.

Sponsored-by: unqueued on Patreon
2023-07-05 12:47:30 -04:00
Joey Hess
c2c2abe6ca
bug 2023-07-05 12:11:48 -04:00
nobodyinperson
583f87fdca 2023-07-04 18:49:01 +00:00
yarikoptic
d735bad076 initial report on annex sync odd behavior loosing my precious commit 2023-06-30 19:39:46 +00:00