Commit graph

40282 commits

Author SHA1 Message Date
Joey Hess
39d7479366
comment 2021-07-21 11:06:03 -04:00
neil.okamoto@6ca5b1b6563bc71ce13ec235852d23e6ac86e331
9da4a7d5b2 Added a comment 2021-07-21 07:13:02 +00:00
neil.okamoto@6ca5b1b6563bc71ce13ec235852d23e6ac86e331
24c88e8167 Added a comment 2021-07-20 23:22:29 +00:00
Joey Hess
455e182e21
comment 2021-07-19 12:39:17 -04:00
Joey Hess
3d50b47ded
sync, merge: Added --allow-unrelated-histories option
Which is the same as the git merge option.

After last commit, this turns out to be needed in the test suite, and when
doing git-annex import from special remote, followed by a git-annex merge.

Sponsored-by: Svenne Krap on Patreon
2021-07-19 12:14:26 -04:00
Joey Hess
b6bea0d3f2
remove direct mode remnant of merging unrelated histories
sync, merge, post-receive: Avoid merging unrelated histories, which used to
be allowed only to support direct mode repositories.

(However, sync does still merge unrelated histories when importing trees
from special remotes, and the assistant still merges unrelated histories
always.)

See 556b2ded2b for why this was added
back in 2016, for direct mode.

This is a behavior change, which might break something that was relying
on sync merging unrelated histories, but git had a good reason to
prevent it, since it's easy to foot shoot with it, and git-annex should
follow suit.

Sponsored-by: Noam Kremen on Patreon
2021-07-19 11:41:26 -04:00
Joey Hess
33a80d083a
sync --quiet
* sync: When --quiet is used, run git commit, push, and pull without
  their ususual output.
* merge: When --quiet is used, run git merge without its usual output.

This might also make --quiet work better for some other commands
that make commits, like git-annex adjust.

Sponsored-by: Kevin Mueller on Patreon
2021-07-19 11:28:47 -04:00
Joey Hess
f84bd8e921
Merge branch 'master' of ssh://git-annex.branchable.com 2021-07-19 11:24:45 -04:00
Joey Hess
fccb51ac09
comment 2021-07-19 10:29:12 -04:00
Atemu
99f136c2bc 2021-07-18 22:36:15 +00:00
remyabel
6517d057a0 2021-07-18 04:25:29 +00:00
anarcat
6d4baa4943 Added a comment: same problem on debian bullseye 2021-07-18 02:02:43 +00:00
Joey Hess
30eed6cf97
Merge branch 'master' of ssh://git-annex.branchable.com 2021-07-17 17:42:57 -04:00
Atemu
cf708a8871 Added a comment 2021-07-16 22:47:44 +00:00
Joey Hess
c9b9a93509
close 2021-07-16 16:28:22 -04:00
Joey Hess
acbf711e21
comment 2021-07-16 15:16:56 -04:00
Joey Hess
635e7f3e26
split annexLocations
To avoid mistakes like commit 0ccbed4f6f,
be explicit about the two variants of this.

Incidentially avoids a small amount of overhead in calling reverse.

Sponsored-by: Shae Erisson on Patreon
2021-07-16 14:17:56 -04:00
Joey Hess
aa33c928cb
Merge branch 'master' of ssh://git-annex.branchable.com 2021-07-16 14:02:41 -04:00
Joey Hess
dc4e79c582
I understand this now, marking confirmed 2021-07-16 14:02:12 -04:00
alt
a4f31f583c Added a comment 2021-07-16 12:37:47 +00:00
Atemu
a4947c65ec Added a comment 2021-07-16 11:21:43 +00:00
guardcat
498e9d74e1 Added a comment: appendix 2021-07-16 06:34:53 +00:00
guardcat
dc56673246 Added a comment: Fixing problem 2021-07-16 06:21:23 +00:00
guardcat
b4edd6f1a9 removed 2021-07-16 06:03:55 +00:00
guardcat
8b33b4254c Added a comment: Fixing problem 2021-07-16 06:02:17 +00:00
Joey Hess
a602554ed8
Merge branch 'master' of ssh://git-annex.branchable.com 2021-07-15 21:02:29 -04:00
Joey Hess
0ccbed4f6f
fix oops
dd31fe7b9e broke non-bare repos by using
bare hash dirs first, oops
2021-07-15 21:01:07 -04:00
jgsuess@732b8c62c50d8595d7b1d58eea11e5019c2308b1
cc36d6e538 2021-07-16 00:32:49 +00:00
Lukey
3c1f7ee773 Added a comment 2021-07-15 18:40:13 +00:00
Lukey
ca12b01fca Clarify 2021-07-15 18:30:22 +00:00
Joey Hess
84fad13bbf
more forumbugs
There are surely a lot more of these..
2021-07-15 13:06:56 -04:00
Joey Hess
0846d3679e
followup 2021-07-15 13:05:25 -04:00
Joey Hess
86524edd29
more forumbugs 2021-07-15 12:59:43 -04:00
Joey Hess
019b91f2a9
fix name 2021-07-15 12:56:44 -04:00
Joey Hess
19b3afeec5
rename tag page 2021-07-15 12:55:05 -04:00
Joey Hess
c63fca74e9
fix syntax 2021-07-15 12:53:03 -04:00
Joey Hess
1fad1640fe
don't treat bugreport tag page as a bug report 2021-07-15 12:52:21 -04:00
Joey Hess
fd9ea6e1da
forum posts tagged bugreport get moved to the bug list and can be closed 2021-07-15 12:50:08 -04:00
Joey Hess
c952c485c8
Fix retrieval of content from borg repos accessed over ssh
It was making the borgrepo path absolute.. even when it was a ssh
repository.

Made BorgRepo a newtype, to guard against accidentially treating it like a
FilePath.

Sponsored-by: Graham Spencer on Patreon
2021-07-15 12:39:24 -04:00
Joey Hess
b2a7a665b2
comment 2021-07-15 12:19:49 -04:00
Joey Hess
dd31fe7b9e
fall back to checking lower case hash directories in normal repo
Fix a bug that prevented getting content from a repository that started out
as a bare repository, or had annex.crippledfilesystem set, and was
converted to a non-bare repository.

This unfortunately means that inAnnex check gets slowed down by a stat call
in normal repos when the content is not present. Oh well, such is the cost
of backwards compatability with old mistakes.

Sponsored-by: Mark Reidenbach on Patreon
2021-07-15 12:16:31 -04:00
Joey Hess
c3fb25c317
comment 2021-07-15 11:48:12 -04:00
Joey Hess
a8d1d83c0b
Merge branch 'master' of ssh://git-annex.branchable.com 2021-07-15 11:43:40 -04:00
guardcat
2a0ac54f2a 2021-07-15 10:33:26 +00:00
guardcat
c9c33d73ec 2021-07-15 10:29:59 +00:00
guardcat
6855905d04 2021-07-15 09:45:54 +00:00
guardcat
2f00626880 2021-07-15 09:35:40 +00:00
alt
24041617a4 2021-07-15 07:19:33 +00:00
jzj
84f8584ada 2021-07-15 03:10:45 +00:00
Atemu
eb89eeea30 Added a comment 2021-07-14 21:27:42 +00:00