This commit is contained in:
Joey Hess 2022-09-20 13:49:21 -04:00
parent 8479ac6a50
commit 7a1b7ce795
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
2 changed files with 31 additions and 0 deletions

View file

@ -0,0 +1,15 @@
[[!comment format=mdwn
username="joey"
subject="""comment 3"""
date="2022-09-20T17:37:53Z"
content="""
I think that the documentation of [[git-annex-unlock]] is pretty clear
about this:
Unlocking a file changes how it is stored in the git repository
(from a symlink to a pointer file), so this command will make
a change that you can commit.
To get the equivilant of the old direct mode, where files are unlocked in
one repository without affecting other clones, use `git-annex adjust --unlock`.
"""]]

View file

@ -0,0 +1,16 @@
[[!comment format=mdwn
username="joey"
subject="""comment 4"""
date="2022-09-20T17:43:18Z"
content="""
Since unlocking makes a change to a file that git can commit,
you can certianly find the commit that made this change if you look hard
enough. Probably not one of the merge commits themselves, but one of the
commits that was merged. I'd maybe try `git log -u` on a file that I know
has otherwise not changed for a while. When the diff shows
that the mode of the file has changed from 120000 to 100644,
that's the change from a locked symlink to an unlocked file.
To disable the smudge/clean filters, edit `.git/config`
and delete the block of config under `[filter "annex"]`
"""]]