From 7a1b7ce795278d2f8cff946c04c5c3180885fdc9 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 20 Sep 2022 13:49:21 -0400 Subject: [PATCH] comment --- ...t_3_c6ad0934136448a014f6b1c317bba3e6._comment | 15 +++++++++++++++ ...t_4_c05f95ae6d69cdc214a2b31ebc296a3b._comment | 16 ++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 doc/forum/Not_enough_free_space/comment_3_c6ad0934136448a014f6b1c317bba3e6._comment create mode 100644 doc/forum/Not_enough_free_space/comment_4_c05f95ae6d69cdc214a2b31ebc296a3b._comment diff --git a/doc/forum/Not_enough_free_space/comment_3_c6ad0934136448a014f6b1c317bba3e6._comment b/doc/forum/Not_enough_free_space/comment_3_c6ad0934136448a014f6b1c317bba3e6._comment new file mode 100644 index 0000000000..da7bdac67a --- /dev/null +++ b/doc/forum/Not_enough_free_space/comment_3_c6ad0934136448a014f6b1c317bba3e6._comment @@ -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`. +"""]] diff --git a/doc/forum/Not_enough_free_space/comment_4_c05f95ae6d69cdc214a2b31ebc296a3b._comment b/doc/forum/Not_enough_free_space/comment_4_c05f95ae6d69cdc214a2b31ebc296a3b._comment new file mode 100644 index 0000000000..cdce83bd34 --- /dev/null +++ b/doc/forum/Not_enough_free_space/comment_4_c05f95ae6d69cdc214a2b31ebc296a3b._comment @@ -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"]` +"""]]