diff options
Diffstat (limited to 'doc')
3 files changed, 30 insertions, 1 deletions
diff --git a/doc/bugs/git-annex_confuses_Git_with_nested_submodules/comment_6_11528378e8c509940190cf84db7ed3d6._comment b/doc/bugs/git-annex_confuses_Git_with_nested_submodules/comment_6_11528378e8c509940190cf84db7ed3d6._comment new file mode 100644 index 000000000..a6362816a --- /dev/null +++ b/doc/bugs/git-annex_confuses_Git_with_nested_submodules/comment_6_11528378e8c509940190cf84db7ed3d6._comment @@ -0,0 +1,14 @@ +[[!comment format=mdwn + username="joey" + subject="""comment 6""" + date="2016-05-16T20:14:57Z" + content=""" +I hope this will be fixed on the git side, but I don't know when it will +be. Probably comes down to someone developing a patch. + +Occurs to me that git-annex could use adjusted branches to deal with this. +When initializing in a submodule, it could enter an adjusted branch with +`git annex adjust --fix`. This way, symlinks would be re-written to point +to the submodule's git repository. The .git dotfile would not need to be +converted to a symlink at all. +"""]] diff --git a/doc/design/adjusted_branches/comment_4_adfcbfa7a9193318cba459766a60c072._comment b/doc/design/adjusted_branches/comment_4_adfcbfa7a9193318cba459766a60c072._comment new file mode 100644 index 000000000..2037a5f32 --- /dev/null +++ b/doc/design/adjusted_branches/comment_4_adfcbfa7a9193318cba459766a60c072._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="joey" + subject="""comment 4""" + date="2016-05-16T20:34:28Z" + content=""" +@thowz great idea! And not hard at all to implement! I've done so: +`git annex adjust --fix` +"""]] diff --git a/doc/git-annex-adjust.mdwn b/doc/git-annex-adjust.mdwn index 551eabe01..a2e65661a 100644 --- a/doc/git-annex-adjust.mdwn +++ b/doc/git-annex-adjust.mdwn @@ -4,7 +4,7 @@ git-annex adjust - enter an adjusted branch # SYNOPSIS -git annex adjust --unlock` +git annex adjust --unlock|--fix` # DESCRIPTION @@ -33,6 +33,13 @@ This command can only be used in a v6 git-annex repository. Unlock all annexed files in the adjusted branch. This allows annexed files to be modified. +* `--fix` + + Fix the symlinks to annexed files to point to the local git annex + object directory. This can be useful if a repository is checked out in an + unusual way that prevents the symlinks committed to git from pointing at + the annex objects. + # SEE ALSO [[git-annex]](1) |