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

adjust: Add --fix adjustment, which is useful when the git directory is in a nonstandard place.

Browse source
This commit is contained in:
Joey Hess 2016-05-16 17:05:42 -04:00
parent 76170b0457
commit eda5d9cc74
Failed to extract signature
7 changed files with 99 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

14
doc/bugs/git-annex_confuses_Git_with_nested_submodules/comment_6_11528378e8c509940190cf84db7ed3d6._comment Normal file
View file

@ -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.
"""]]

8
doc/design/adjusted_branches/comment_4_adfcbfa7a9193318cba459766a60c072._comment Normal file
View file

@ -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`
"""]]

9
doc/git-annex-adjust.mdwn
View file

@ -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)