mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
36430 commits 13 branches 442 tags 103 MiB
Commit graph

27298 commits

Author SHA1 Message Date
Joey Hess
a78eb6dd58
sync --only-annex and annex.synconlyannex 
* Added sync --only-annex, which syncs the git-annex branch and annexed
  content but leaves managing the other git branches up to you.
* Added annex.synconlyannex git config setting, which can also be set with
  git-annex config to configure sync in all clones of the repo.

Use case is then the user has their own git workflow, and wants to use
git-annex without disrupting that, so they sync --only-annex to get the
git-annex stuff in sync in addition to their usual git workflow.

When annex.synconlyannex is set, --not-only-annex can be used to override
it.

It's not entirely clear what --only-annex --commit or --only-annex
--push should do, and I left that combination not documented because I
don't know if I might want to change the current behavior, which is that
such options do not override the --only-annex. My gut feeling is that
there is no good reasons to use such combinations; if you want to use
your own git workflow, you'll be doing your own committing and pulling
and pushing.

A subtle question is, how should import/export special remotes be handled?
Importing updates their remote tracking branch and merges it into master.
If --only-annex prevented that git branch stuff, then it would prevent
exporting to the special remote, in the case where it has changes that
were not imported yet, because there would be a unresolved conflict.

I decided that it's best to treat the fact that there's a remote tracking
branch for import/export as an implementation detail in this case. The more
important thing is that an import/export special remote is entirely annexed
content, and so it makes a lot of sense that --only-annex will still sync
with it.
 2020-02-17 16:33:10 -04:00
Dan
1c387175eb Added a comment: Thanks 2020-02-17 17:52:22 +00:00
Joey Hess
96eb008910
comment 2020-02-17 13:42:21 -04:00
Joey Hess
9c94bd138f
comment 2020-02-17 13:11:01 -04:00
Joey Hess
87356a8f32
response 2020-02-17 13:04:18 -04:00
Joey Hess
39864fe1b4
close wontfix 2020-02-17 12:53:27 -04:00
Joey Hess
f4bf2ccc7a
comment 2020-02-17 12:45:00 -04:00
Joey Hess
f3682e50e5
response 2020-02-17 12:29:18 -04:00
Joey Hess
d04e6aac6c
comment 2020-02-17 12:26:09 -04:00
Joey Hess
d2e0996c04
comment 2020-02-17 12:04:54 -04:00
Joey Hess
ef3e203436
comment 2020-02-17 11:56:08 -04:00
Ilya_Shlyakhter
ae75b673cf Added a comment 2020-02-16 04:05:11 +00:00
yarikoptic
3d4f068796 Added a comment 2020-02-15 04:45:05 +00:00
Ilya_Shlyakhter
703a88a58e Added a comment: ssh caching 2020-02-14 20:53:30 +00:00
giuly.ippoliti@c1e2f0d5e40b128900f94f3d107d3719f87c3ff7
993c9e98f2 Added a comment: Disable git annex logs 2020-02-14 19:39:30 +00:00
Joey Hess
879f52a116
annex.tune.branchhash1=true bugfix 
Fix support for repositories tuned with annex.tune.branchhash1=true,
including --all not working and git-annex log not displaying anything for
annexed files.
 2020-02-14 15:22:48 -04:00
Joey Hess
c265cf27a0
tag moreinfo 2020-02-14 14:53:39 -04:00
Joey Hess
352963690a
fsck --from remote -J concurrency bug 
fsck --from remote: Fix a concurrency bug that could make it incorrectly
detect that content in the remote is corrupt, and remove it, resulting in
data loss.
 2020-02-14 14:52:15 -04:00
Joey Hess
399319ccbc
Avoid throwing fatal errors when asked to write to a readonly git remote on http 
Test suite found one of them, looking for giveup turned up several more.
 2020-02-14 14:38:13 -04:00
Joey Hess
a490947068
annex.sshcaching warning improvement and allow overridding build time default 
* When git-annex is built with a ssh that does not support ssh connection
  caching, default annex.sshcaching to false, but let the user override it.
* Improve warning messages further when ssh connection caching cannot
  be used, to clearly state why.
 2020-02-14 14:21:03 -04:00
Joey Hess
8397f585f5
Merge branch 'master' of ssh://git-annex.branchable.com 2020-02-14 13:47:08 -04:00
yarikoptic
0af85edb58 Added a comment 2020-02-14 17:20:29 +00:00
yarikoptic
8214da5715 Initial TODO on making --whatelse machine readable 2020-02-14 17:18:37 +00:00
jochen.keil@38b1f86ab65128dab3e62e726403ceee4f5141bf
3868a2fef1 Added a comment 2020-02-14 12:04:54 +00:00
Dan
1b69ee5d4b removed 2020-02-14 01:23:50 +00:00
Dan
fbc2011404 Added a comment: Editing Comments? 2020-02-14 01:23:13 +00:00
Dan
84c9017862 Added a comment: Editing Comments? 2020-02-14 01:22:50 +00:00
Dan
6d82045149 Added a comment: Still wanted (update with example) 2020-02-13 20:08:48 +00:00
lykos@d125a37d89b1cfac20829f12911656c40cb70018
16171f8c5c Added a comment 2020-02-13 12:29:43 +00:00
jochen.keil@38b1f86ab65128dab3e62e726403ceee4f5141bf
dec1c65f5a 2020-02-13 11:39:02 +00:00
Ilya_Shlyakhter
eb6527197f added bug report re: warning about ssh caching keeps showing 2020-02-12 18:12:10 +00:00
Nick_P
a0f39a0412 Added a comment 2020-02-12 10:50:09 +00:00
cnjr2
58ebe5fc28 Added a comment 2020-02-12 10:37:27 +00:00
Joey Hess
933cb573df
Merge branch 'master' of ssh://git-annex.branchable.com 2020-02-10 16:03:48 -08:00
Ilya_Shlyakhter
ea849f1259 Added a comment: default git-annex version in distros 2020-02-10 18:55:31 +00:00
Ilya_Shlyakhter
4074f1aff8 Added a comment: reasons not to have annex.genmetadata default to true 2020-02-10 18:40:54 +00:00
oliv5
157ea18a3d Added a comment 2020-02-10 10:10:09 +00:00
max
206d2e6bfb Added a comment: adding support for additional metadata tools? 2020-02-10 04:45:56 +00:00
titaniumfiles@5227364ee3e2f9207bc36b6ebb281fc7af6d3c16
b0bdcc47fa 2020-02-10 02:16:28 +00:00
Ilya_Shlyakhter
fa9962025d Added a comment: git-annex ubuntu package 2020-02-10 02:07:13 +00:00
Ilya_Shlyakhter
72be5145b2 Added a comment: updating git-annex 2020-02-10 00:05:02 +00:00
oliv5
0fdaf83733 Added a comment 2020-02-09 22:59:38 +00:00
Ilya_Shlyakhter
150881b7dc Added a comment: adding plain git files in v7 repos 2020-02-09 18:08:31 +00:00
Joey Hess
b175717811
Merge branch 'master' of ssh://git-annex.branchable.com 2020-02-09 09:05:58 -08:00
oliv5
c6dd38158d 2020-02-09 10:05:23 +00:00
chkno@50332f55d5ef2f4b7c6bec5253b853a8f2dc770e
9e7ce2076f Added a comment: Three union-mounting methods that *don't* work 2020-02-08 06:21:05 +00:00
achilleas.k@14be77d42a1252fab5ec9dbf4e5ea03c5833e8c8
c94cac580d 2020-02-07 14:37:31 +00:00
Joey Hess
a92104c8d8
Merge branch 'master' of ssh://git-annex.branchable.com 2020-02-06 22:13:15 -08:00
Ilya_Shlyakhter
83fb031460 Added a comment: potential security issues? 2020-02-06 21:00:57 +00:00
t+gitannex@1d62779e8b54f30a854739f61542a6885167b01f
9918952a5b Added a comment 2020-02-06 11:07:35 +00:00
lykos@d125a37d89b1cfac20829f12911656c40cb70018
227206c089 2020-02-06 06:56:41 +00:00
Joey Hess
b49c10e8af
update 2020-02-05 20:48:23 -08:00
Ilya_Shlyakhter
5c57440482 Added a comment: example of where retries could help 2020-02-05 22:19:30 +00:00
Ilya_Shlyakhter
28dc7d01de Added a comment: retries due to locked index file 2020-02-05 16:59:44 +00:00
Ilya_Shlyakhter
8db097e081 Added a comment: aborting stuck operations so they can be retried 2020-02-05 16:39:40 +00:00
Joey Hess
b2c529b88e
add news item for git-annex 7.20200204 2020-02-04 14:33:57 -04:00
Joey Hess
c9357bdc0e
ifdef persistent-template 2.8.0 fixes 
The i386ancient build has a ghc too old for these extensions.

Build with persistent-template 2.8.0 tested.
 2020-02-04 13:53:00 -04:00
Joey Hess
ee718fb35d
Makefile: Really move the fish completion to the vendor_completions.d directory. 2020-02-04 12:10:09 -04:00
Joey Hess
4920df6573
Fix build with newest version of persistent-template. 
This is untested because of rain, also I am operating from truncated
copiler error messages in a bug report that also doesn't mention what the
library version is. Still, it should work.

May break builds with old ghc, in particular DerivingStrategies is
I think fairly new? The pragmas could be ifdefed if necessary. Works with
ghc 8.6.5.
 2020-02-04 12:03:30 -04:00
nrg@bd619d1ebf16e6324c546adea8be8fe1cc2b4325
ae2d42bad4 Added a comment: Change introduced by persistent-sqlite and persistent-template 2020-02-04 15:10:04 +00:00
https://christian.amsuess.com/chrysn
1a306aea34 Added a comment: union mounting and hidemissing 2020-02-04 09:01:53 +00:00
chkno@50332f55d5ef2f4b7c6bec5253b853a8f2dc770e
3367266cdb Added a comment: Interim shell script 2020-02-04 07:26:11 +00:00
chkno@50332f55d5ef2f4b7c6bec5253b853a8f2dc770e
5996fc6df0 removed 2020-02-04 07:16:20 +00:00
chkno@50332f55d5ef2f4b7c6bec5253b853a8f2dc770e
36623e963e Added a comment: Interim shell scripts 2020-02-04 06:43:04 +00:00
annex2384@290036d126d86bcec28ee2f2ead549de1f59e90e
b44b35da63 Added a comment: Similar use case 2020-02-04 03:48:40 +00:00
jafpoU
c1b73ad35f Added a comment 2020-02-04 03:35:49 +00:00
annex2384@290036d126d86bcec28ee2f2ead549de1f59e90e
f720ea05a9 Added a comment: Using -o metadata? 2020-02-04 03:22:46 +00:00
eschwartz@5abb721e66990e478c7d1caf96beb4f9794eb168
841fcaeeaf Added a comment: Partial fix only. 2020-02-03 23:47:38 +00:00
Chel
8bc02e5899 Added a comment 2020-02-03 23:34:05 +00:00
nrg@bd619d1ebf16e6324c546adea8be8fe1cc2b4325
c01296be69 Added a comment: Confirmed with macOS 10.14.6 building git-annex-7.20200202.7 2020-02-03 23:10:23 +00:00
Chel
69c9506d7d Added a comment 2020-02-03 22:37:01 +00:00
Joey Hess
8d56adfe1b
Merge branch 'master' of ssh://git-annex.branchable.com 2020-02-03 12:52:08 -04:00
Joey Hess
a75aeb5ff4
move comment to right bug and simplify another 2020-02-03 12:51:28 -04:00
jafpoU
7d539c793b 2020-02-03 15:49:54 +00:00
Joey Hess
0f331bff9d
add news item for git-annex 7.20200202.7 2020-02-02 16:56:53 -04:00
Joey Hess
1cfe72c103
Merge branch 'master' of ssh://git-annex.branchable.com 2020-02-02 16:48:58 -04:00
Joey Hess
d44fb89d4f
fix Arbitrary AssociatedFile to not crash when LANG=C 
Even letting through things that Data.Char.generalCategory said
wereUppercaseLetter caused the crash. Apparently what's going on is
that, in LANG=C, it does not expect to find unicode chars in a String,
except presumably ones that are surrogates.

But ascii is good enough to test the things we need to test about
associated files.
 2020-02-02 16:37:25 -04:00
erewhon
31757fe6f5 removed 2020-02-02 18:46:09 +00:00
erewhon
1a1eadac4a Added a comment: Thank you 2020-02-02 18:45:25 +00:00
erewhon
caa44e7ef4 Added a comment: Thank you 2020-02-02 18:44:54 +00:00
jeanpmbox-456@7222359de8d1f37a7cf25a519e8faf90a9517b50
3a5a510f18 Added a comment 2020-02-01 11:35:39 +00:00
Chel
2198ba76f7 Added a comment 2020-02-01 02:55:07 +00:00
Chel
b65d7f3d04 Added a comment 2020-02-01 02:32:02 +00:00
Ilya_Shlyakhter
8d3364265e Added a comment: simpler proposal 2020-01-31 21:46:58 +00:00
Ilya_Shlyakhter
36e298daff Added a comment 2020-01-31 20:32:01 +00:00
https://christian.amsuess.com/chrysn
8ae290623e Added a comment: Re: comment 1 2020-01-31 19:48:02 +00:00
Ilya_Shlyakhter
76a432dacc Added a comment: alternate keys 2020-01-31 19:23:38 +00:00
anarcat
21f58eeb3d link to the xxhash todo 2020-01-30 19:46:11 +00:00
Joey Hess
6f7a09c50f
fix quoting 2020-01-30 15:44:11 -04:00
Joey Hess
4131b7da04
fix inline 2020-01-30 15:40:46 -04:00
Joey Hess
52a6bae506
fix tag name 2020-01-30 15:38:56 -04:00
Joey Hess
a767622ad8
list of confirmed todos 
aka, an actual todo list again
 2020-01-30 15:37:21 -04:00
Joey Hess
b238f5e2a9
comment 2020-01-30 15:27:00 -04:00
Joey Hess
cffa2446e8
tagged the past 2 years of open todos and followed up to a few of them 
also moved some that were really bug reports to bugs/ and closed a
couple
 2020-01-30 15:22:05 -04:00
Joey Hess
c08d5612ee
correction 2020-01-30 13:04:53 -04:00
Joey Hess
962f1f2363
mention limitation of --known 2020-01-30 12:54:15 -04:00
Joey Hess
18efb40c85
comment 2020-01-30 12:49:00 -04:00
Joey Hess
103eb66fdb
comment 2020-01-30 12:43:31 -04:00
Joey Hess
be417c847c
Merge branch 'master' of ssh://git-annex.branchable.com 2020-01-30 12:41:17 -04:00
Joey Hess
e2ac9cf521
already fixed 2020-01-30 12:40:39 -04:00
Joey Hess
653462b9da
fix directive 2020-01-30 12:15:41 -04:00
Ilya_Shlyakhter
d876c7e0cd added a hyperlink from scalability page to scalability tips page 2020-01-30 15:52:53 +00:00
Joey Hess
1427203226
comment 2020-01-30 11:42:36 -04:00
breck7@4bbace32c18ebb98fc730d56c6ed76b7bcc0798e
cec1db336e Added a comment: Thank you 2020-01-30 15:15:27 +00:00
joon.ch@e354453395d8e8c33990f849b7290777ce693984
e50b2298d3 2020-01-29 18:43:02 +00:00
Ilya_Shlyakhter
9be407d49a Added a comment: use case to record chunked state 2020-01-29 17:48:43 +00:00
ybnd@c7eb8e2b23076d68c3e16230e1d7887d8af6c4f1
196599c120 Fix double around Annex` 2020-01-29 16:52:22 +00:00
Joey Hess
5d2f7fda71
styling 2020-01-29 11:35:40 -04:00
Joey Hess
f746a65877
more tagging 2020-01-29 11:34:14 -04:00
Joey Hess
48fa70d56a
missed one 2020-01-29 11:32:02 -04:00
Joey Hess
1a0071f4d5
tagging todo items 2020-01-29 11:28:32 -04:00
Joey Hess
281bf13236
comment 2020-01-29 10:44:43 -04:00
Joey Hess
276540cc31
Merge branch 'master' of ssh://git-annex.branchable.com 2020-01-29 10:18:30 -04:00
https://christian.amsuess.com/chrysn
d2bc23487a Added a comment: Re: use of RAM disk 2020-01-29 07:49:12 +00:00
Ilya_Shlyakhter
8789697805 Added a comment: chunks and checksums 2020-01-28 18:20:36 +00:00
Ilya_Shlyakhter
486a0b236d Added a comment: use of RAM disk 2020-01-28 17:23:32 +00:00
https://christian.amsuess.com/chrysn
5f7be42858 Added a comment: Use of the RAM disk 2020-01-28 14:03:18 +00:00
Ilya_Shlyakhter
f2c13f73c9 added todo request: setpresentkey option to record chunked state 2020-01-27 20:28:46 +00:00
Joey Hess
98b4291ca8
Merge branch 'master' of ssh://git-annex.branchable.com 2020-01-27 15:38:03 -04:00
Ilya_Shlyakhter
2b1357bcc8 added suggestion: option to put temp files on a RAM disk 2020-01-27 18:24:44 +00:00
Ilya_Shlyakhter
9dd0de11eb added todo: let external remotes declare support for named pipes 2020-01-27 01:22:10 +00:00
Chel
99ead7bcf4 Added a comment 2020-01-26 22:48:09 +00:00
Chel
3b917ee5c8 I am talking about myself... 2020-01-26 21:09:53 +00:00
Chel
20768c716c Improved additional information 2020-01-26 21:03:47 +00:00
Chel
4e6b636f7a Bug report: Parallel fsck with same-key files 2020-01-26 20:50:11 +00:00
Ilya_Shlyakhter
d56432dad5 Added a comment 2020-01-26 18:43:58 +00:00
Chel
072e74ccec 2020-01-26 18:38:58 +00:00
annex2384@290036d126d86bcec28ee2f2ead549de1f59e90e
9e611e26bf 2020-01-26 16:44:41 +00:00
jeanpmbox-456@7222359de8d1f37a7cf25a519e8faf90a9517b50
34d82c5eaa 2020-01-26 16:30:45 +00:00
jeanpmbox-456@7222359de8d1f37a7cf25a519e8faf90a9517b50
d426e414cc disable git-annex autostart in windows 2020-01-26 16:28:48 +00:00
CandyAngel
91eb9a92cb Added a comment 2020-01-25 01:11:44 +00:00
Ilya_Shlyakhter
2d69133169 Added a comment: starting over with a new commit history 2020-01-25 01:07:22 +00:00
erewhon_smith@6671dff14d578cb6d55a3ca285f2c54151b69f60
c57e245d0b 2020-01-24 23:49:26 +00:00
erewhon_smith@6671dff14d578cb6d55a3ca285f2c54151b69f60
90dff7f6e1 2020-01-24 23:48:25 +00:00
erewhon_smith@6671dff14d578cb6d55a3ca285f2c54151b69f60
b434494a6f 2020-01-24 23:46:44 +00:00
yarikoptic
2e3159f566 failing test report 2020-01-24 14:45:34 +00:00
Ilya_Shlyakhter
efb9813888 Added a comment 2020-01-24 00:26:36 +00:00
jamesread
e0be4e9d70 2020-01-23 22:43:25 +00:00
Joey Hess
e033010276
close 2020-01-23 16:45:27 -04:00
Joey Hess
5c3d06b070
Makefile: Move the fish completion to the vendor_completions.d directory. 2020-01-23 16:42:08 -04:00
Joey Hess
366e398bf0
close 2020-01-23 16:31:12 -04:00
Joey Hess
7b4f30de6c
switch to buglist template 
so tags are displayed
 2020-01-23 16:29:24 -04:00
Joey Hess
648cb15fb4
comment 2020-01-23 16:29:14 -04:00
mario
9d7bb76ad3 Added a comment: Thank you 2020-01-23 19:52:50 +00:00
Joey Hess
07a8d6dd65
comment 2020-01-23 15:33:41 -04:00
Joey Hess
342ff4666c
comment 2020-01-23 15:21:31 -04:00
Joey Hess
41d2182298
close 2020-01-23 15:15:25 -04:00
Joey Hess
7ffdc1f10c
comment 2020-01-23 15:08:46 -04:00
Joey Hess
f54286c672
close 2020-01-23 14:51:35 -04:00
yarikoptic
9d822f0d2d Added a comment 2020-01-23 17:52:02 +00:00