Commit graph

1043 commits

Author SHA1 Message Date
https://dead-doomer.livejournal.com/
4794416b9c Added a comment 2020-06-17 06:42:53 +00:00
https://dead-doomer.livejournal.com/
2524a84a15 Corrected the first command to match what is actually on the file system 2020-06-17 01:17:25 +00:00
https://dead-doomer.livejournal.com/
08bc046416 Added a comment 2020-06-17 01:13:46 +00:00
Joey Hess
f0f1a23404
Merge branch 'master' of ssh://git-annex.branchable.com 2020-06-16 13:55:07 -04:00
Joey Hess
9f61cb94c0
comment 2020-06-16 12:53:10 -04:00
https://dead-doomer.livejournal.com/
fc909493e5 Added a comment 2020-06-16 16:31:32 +00:00
https://dead-doomer.livejournal.com/
11a15eee2d Added a comment: How do I specify a merge command if I don't need separate branches? 2020-06-16 16:17:48 +00:00
https://dead-doomer.livejournal.com/
273a4b283e removed 2020-06-16 16:15:24 +00:00
https://dead-doomer.livejournal.com/
d370aff8dc Added a comment: How do I specify a merge command if I don't need separate branches? 2020-06-16 16:11:30 +00:00
Joey Hess
75add873de
fix paste 2020-05-12 09:55:54 -04:00
Joey Hess
57451bd9a1
followup 2020-05-11 13:06:39 -04:00
thk
6431fc1b26 Added a comment: Delete duplicates and specify preferred locations 2020-04-26 11:18:39 +00:00
mike@920d668f9cacd7a1a8886c180a95a0150e2ab283
df8c5b942b removed 2020-04-02 00:06:54 +00:00
mike@920d668f9cacd7a1a8886c180a95a0150e2ab283
76693bceda removed 2020-04-02 00:06:22 +00:00
mike@920d668f9cacd7a1a8886c180a95a0150e2ab283
78b6264a0a Added a comment 2020-04-01 23:37:55 +00:00
thk
5df80188be Added a comment: Also problem with USB drives 2020-03-31 06:36:14 +00:00
Soxofaan
63e75b71f8 removed duplicate "encryption=none" in initremote command 2020-03-28 10:41:53 +00:00
Joey Hess
baaacc2eb3
layout 2020-03-04 22:45:48 -04:00
Joey Hess
facf488de5
two more services with multiple special remotes 2020-03-04 22:42:33 -04:00
Joey Hess
5995eba531
improve special remotes list
In several cases, there's an old, maybe unmaintained special remote,
and rclone also supports the service. I don't know which is better,
so I added tips pages for these, listing both possibilies, so users can
fill in the details.

Added some things listed in special_remotes/rclone that were not
in the cloud provider list, so users will see it supports those.
But, omitted S3 and webdav, since it's probably better for users to use
what's built into git-annex than going via rclone.

The rclone list is out of date apparently, as rclone.org has more,
so I added a note at the bottom for users to check.

This commit was sponsored by Ethan Aubin.
2020-03-04 22:27:56 -04:00
Joey Hess
87356a8f32
response 2020-02-17 13:04:18 -04:00
max
206d2e6bfb Added a comment: adding support for additional metadata tools? 2020-02-10 04:45:56 +00:00
breck7@4bbace32c18ebb98fc730d56c6ed76b7bcc0798e
cec1db336e Added a comment: Thank you 2020-01-30 15:15:27 +00:00
yarikoptic
803722bb2d Added a comment: preferred way to automate population of the cache upon get 2020-01-13 19:01:11 +00:00
AdamSpiers
5aef27d825 add missing backtick 2020-01-13 00:25:27 +00:00
anarcat
6a38d94ceb fix a transcription error - to disable a remote, we set ignore to true, not false! 2020-01-08 15:30:51 +00:00
undral
0585d12ca4 removed 2020-01-08 00:17:47 +00:00
undral
9fe3f9e08f Added a comment: hi 2020-01-08 00:17:14 +00:00
Joey Hess
d0f3b01c31
update comments to point to conversion docs
want to avoid use of -c annex.largefiles..
2020-01-01 14:38:40 -04:00
Joey Hess
503788238c
add --force-annex/--force-git
options make it easier to override annex.largefiles configuration
(and potentially safer as it avoids bugs like the smudge bug fixed
in the last release)

Deleted some old comments that were posted to the man page discussing such
options.

Updated docs that used -c annex.largefiles to use the options.

Note that addSmallOverridden was needed to avoid the clean filter running
on the file. It would be possible to make addFile also update the index
directly, rather than going via git add. However, it was not necessary,
and I want to avoid breaking on some edge case, particularly if the code in
addSmallOverridden has some oversight.

Also, when annex.addunlocked is set and annex.largefiles does not match a file,
git annex add --force-large works, but git status will then show the file
as added, with a unstaged modification. The unstaged modification adds the
file to git. This is identical behavior to using -c annex.largefiles=nothing
when annex.addunlocked is set. This does not prevent committing what was
intended to be added. I have not gotten to the bottom of why git thinks
the file is modified and runs it through the clean filter in this case.
2020-01-01 14:03:06 -04:00
Joey Hess
37467a008f
annex.addunlocked expressions
* annex.addunlocked can be set to an expression with the same format used by
  annex.largefiles, in case you want to default to unlocking some files but
  not others.
* annex.addunlocked can be configured by git-annex config.

Added a git-annex-matching-expression man page, broken out from
tips/largefiles.

A tricky consequence of this is that git-annex add --relaxed
honors annex.addunlocked, but an expression might want to know the size
or content of an url, which it's not going to download. I decided it was
better not to fail, and just dummy up some plausible data in that case.

Performance impact should be negligible. The global config is already
loaded for annex.largefiles. The expression only has to be parsed once,
and in the simple true/false case, it should not do any additional work
matching it.
2019-12-20 15:56:25 -04:00
Joey Hess
4acbb40112
git-annex config annex.largefiles
annex.largefiles can be configured by git-annex config, to more easily set
a default that will also be used by clones, without needing to shoehorn the
expression into the gitattributes file. The git config and gitattributes
override that.

Whenever something is added to git-annex config, we have to consider what
happens if a user puts a purposfully bad value in there. Or, if a new
git-annex adds some new value that an old git-annex can't parse.
In this case, a global annex.largefiles that can't be parsed currently
makes an error be thrown. That might not be ideal, but the gitattribute
behaves the same, and is almost equally repo-global.

Performance notes:

git-annex add and addurl construct a matcher once
and uses it for every file, so the added time penalty for reading the global
config log is minor. If the gitattributes annex.largefiles were deprecated,
git-annex add would get around 2% faster (excluding hashing), because
looking that up for each file is not fast. So this new way of setting
it is progress toward speeding up add.

git-annex smudge does need to load the log every time. As well as checking
the git attribute. Not ideal. Setting annex.gitaddtoannex=false avoids
both overheads.
2019-12-20 13:01:41 -04:00
MichaelC
df7bf60998 Added a comment: Does android adb special remote support MTP? 2019-12-10 21:23:31 +00:00
michael.clifford.com@7ca464bc0ba25fd5f2922deb8f531668727a66fb
80b0c9b514 removed 2019-12-10 21:02:23 +00:00
michael.clifford.com@7ca464bc0ba25fd5f2922deb8f531668727a66fb
3c4053e455 Added a comment: android special remote via mtp supported? 2019-12-10 21:01:53 +00:00
Joey Hess
5877de5e80
git-lfs: remember urls, and autoenable remotes using known urls
* git-lfs: The url provided to initremote/enableremote will now be
  stored in the git-annex branch, allowing enableremote to be used without
  an url. initremote --sameas can be used to add additional urls.
* git-lfs: When there's a git remote with an url that's known to be
  used for git-lfs, automatically enable the special remote.
2019-11-18 16:09:09 -04:00
Joey Hess
31a5b58b2c
documentation for making git add only annex when configured by annex.largefiles
Code change should be trvial, but not yet implemented. This
significantly complicated the task of documenting how git-annex works.

I'm not sure how useful the annex.gitaddtoannex confguration is after
this change; seems that if a user has an annex.largefiles they will want
it applied consistently. But the last thing I want to hear is more
complaining from users about git add doing something they don't want it
to.

There's a pretty high risk users who got used to the git add behavior
and don't have annex.largefiles configured will miss the NEWS and
complain bitterly about their suddenly bloated repositories. Oh well.

Removed outdated comments about the old behavior to avoid confusion.
I don't know if I've found all the places that griping spread to.
2019-10-24 14:01:54 -04:00
anarcat
b4a9397c4a Added a comment: right! forgot about log -S 2019-10-23 20:16:26 +00:00
anarcat
2755a22c37 update from comments 2019-10-23 20:15:40 +00:00
Joey Hess
a632a16f14
comment 2019-10-21 12:53:04 -04:00
Lukey
c452f01843 Added a comment 2019-10-21 16:27:50 +00:00
anarcat
a2bc387c6b i always have trouble finding this 2019-10-21 15:40:56 +00:00
Joey Hess
37f725a9f7
Merge branch 'master' into sameas 2019-10-11 15:56:00 -04:00
Joey Hess
c0e88b7695
sameas documentation 2019-10-11 14:04:58 -04:00
Joey Hess
3cc23df35b
improve conversion example 2019-10-08 14:17:04 -04:00
Dwk
a9c5a68b65 Added a comment: annexed -> normal git does not work if annexed file was unlocked 2019-10-05 01:45:14 +00:00
Joey Hess
a9f078da43
Merge branch 'master' of ssh://git-annex.branchable.com 2019-09-30 14:21:23 -04:00
Joey Hess
ca0ca6012f
remove -n from example
That was only needed with git-annex before v7. The pre-commit hook no
longer scans for and re-locks typechanged files.
2019-09-30 13:34:26 -04:00
branchable@bafd175a4b99afd6ed72501042e364ebd3e0c45e
04ec673d51 Fix typo and incorrect references to "git annex peer" 2019-09-29 23:34:25 +00:00
branchable@bafd175a4b99afd6ed72501042e364ebd3e0c45e
b45deddbcd Added a comment: Follow-up thought 2019-09-29 22:08:29 +00:00