mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Joey Hess 2021-03-23 11:49:43 -04:00
commit 0af8df6714
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
4 changed files with 75 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
doc/forum/replacing_a_locked_file_without_unlocking_first/comment_4_8aa708a1bf76e452ef12c35999774791._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="Ilya_Shlyakhter"
avatar="http://cdn.libravatar.org/avatar/1647044369aa7747829c38b9dcc84df0"
subject="replacing a locked file with new content"
date="2021-03-22T19:50:25Z"
content="""
Then I guess [[todo/auto-lock_files_after_one_edit]] isn't needed?
"""]]

2
doc/git-annex-unlock.mdwn
View file

@ -20,7 +20,7 @@ The content of an unlocked file is still stored in git-annex, not git,
and when you commit modifications to the file, the modifications will also and when you commit modifications to the file, the modifications will also
be stored in git-annex, with only the pointer file stored in git. be stored in git-annex, with only the pointer file stored in git.
If you use `git add` to add a file, it will be added in unlocked form from If you use `git add` to add a file to the annex, it will be added in unlocked form from
the beginning. This allows workflows where a file starts out unlocked, is the beginning. This allows workflows where a file starts out unlocked, is
modified as necessary, and is locked once it reaches its final version. modified as necessary, and is locked once it reaches its final version.

11
doc/tips/setup_a_public_repository_on_a_web_site/comment_10_5554d52c568fdd5235c498ba999545cb._comment Normal file
View file

@ -0,0 +1,11 @@
[[!comment format=mdwn
username="Lukey"
avatar="http://cdn.libravatar.org/avatar/c7c08e2efd29c692cc017c4a4ca3406b"
subject="comment 10"
date="2021-03-23T07:19:39Z"
content="""
I got it. If the server is on a local network, you have to set `annex.security.allowed-ip-addresses` to allow access.
@joey
Is this intentional for this remote type? If it is, a better error message would be helpful.
"""]]

55
doc/tips/setup_a_public_repository_on_a_web_site/comment_9_2dfb5b225ed62c0310ddadb0d83ceb79._comment Normal file
View file

@ -0,0 +1,55 @@
[[!comment format=mdwn
username="tomdhunt"
avatar="http://cdn.libravatar.org/avatar/02694633d0fb05bb89f025cf779218a3"
subject="comment 9"
date="2021-03-22T23:35:30Z"
content="""
```
[tom@trafalgar clone_test]$ wget http://breitenfeld.lan/annex/.git/config
--2021-03-22 10:23:32-- http://breitenfeld.lan/annex/.git/config
Resolving breitenfeld.lan (breitenfeld.lan)... 192.168.1.241
Connecting to breitenfeld.lan (breitenfeld.lan)|192.168.1.241|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 1064 (1.0K)
Saving to: ‘config’
config 100%[========================================================================================================================================>] 1.04K --.-KB/s in 0s
2021-03-22 10:23:32 (153 MB/s) - ‘config’ saved [1064/1064]
[tom@trafalgar clone_test]$ file config
config: ASCII text
[tom@trafalgar clone_test]$ git config --list --file config
core.repositoryformatversion=0
core.filemode=true
core.bare=false
core.logallrefupdates=true
annex.uuid=4ad5f0f5-9b92-475b-9abf-c1845a42c758
annex.version=8
annex.dotfiles=true
annex.thin=true
annex.addunlocked=include=torrent-downloads/*
annex.sshcaching=true
filter.annex.smudge=git-annex smudge -- %f
filter.annex.clean=git-annex smudge --clean -- %f
remote.surface.url=ssh://tom@DESKTOP-K1RQ50D/home/tom/bigdata
remote.surface.fetch=+refs/heads/*:refs/remotes/surface/*
remote.surface.annex-uuid=b4b17fe9-4c46-44a9-b6cb-0c2c17904830
remote.zfsrent2.url=gcrypt::rsync://user@redacted.server.name/rent_data/data/git/bigdata
remote.zfsrent2.fetch=+refs/heads/*:refs/remotes/zfsrent2/*
remote.zfsrent2.gcrypt-participants=BDF1CB2C01162329
remote.zfsrent2.gcrypt-signingkey=BDF1CB2C01162329
remote.zfsrent2.gcrypt-publish-participants=true
remote.zfsrent2.gcrypt-id=:id:iSB2By8j7YrAY1Zycx+Q
remote.gnubee.url=gcrypt::rsync://archive@gnubee/data2/bigdata
remote.gnubee.fetch=+refs/heads/*:refs/remotes/gnubee/*
remote.gnubee.gcrypt-participants=BDF1CB2C01162329
remote.gnubee.gcrypt-signingkey=BDF1CB2C01162329
remote.gnubee.gcrypt-publish-participants=true
remote.gnubee.gcrypt-id=:id:wAwSE2kqUs9HLuq1usaP
[tom@trafalgar clone_test]$ git remote -v
origin http://breitenfeld.lan/annex/.git/ (fetch)
origin DISABLE (push)
```
FWIW on the server side the only requests I'm seeing to the .git/config URL are my wget tests, so it seems like git-annex never even gets as far as trying to fetch it.
"""]]