Merge branch 'master' of ssh://git-annex.branchable.com

This commit is contained in:
Joey Hess 2016-02-08 14:15:16 -04:00
commit 566f90556f
Failed to extract signature
3 changed files with 61 additions and 0 deletions

View file

@ -0,0 +1,47 @@
### Please describe the problem.
Created a temp repository with a submodule under 3rd/visloc referring to another annex via ssh
[[!format sh """
# I have removed some output/wrong cmd calls, hopefully without side-effects
hopa:/tmp/test
$> cat 3rd/visloc/.git
gitdir: ../../.git/modules/3rd/visloc
$> git commit -m 'RF: ...' -a
[master (root-commit) fc37b4f] RF: ...
2 files changed, 4 insertions(+)
create mode 100644 .gitmodules
create mode 160000 3rd/visloc
$> ls -l 3rd/visloc/.git
-rw------- 1 yoh yoh 38 Feb 8 10:26 3rd/visloc/.git
$> cat 3rd/visloc/.git
gitdir: ../../.git/modules/3rd/visloc
$> cd 3rd/visloc/sub-01/rois
$> git annex get *
fatal: Not a git repository: '../../.git'
git-annex: First run: git-annex init
$> cd -
/tmp/test
$> ls -l 3rd/visloc/.git
lrwxrwxrwx 1 yoh yoh 41 Feb 8 10:43 3rd/visloc/.git -> ../../../../../../.git/modules/3rd/visloc
$> git annex version
git-annex version: 6.20160126+gitg65f4442-1~ndall+1
build flags: Assistant Webapp Pairing Testsuite S3(multipartupload) WebDAV Inotify DBus DesktopNotify XMPP ConcurrentOutput DNS TDFA TorrentParser Feeds Quvi
key/value backends: SHA256E SHA256 SHA512E SHA512 SHA224E SHA224 SHA384E SHA384 SHA3_256E SHA3_256 SHA3_512E SHA3_512 SHA3_224E SHA3_224 SHA3_384E SHA3_384 SKEIN256E SKEIN256 SKEIN512E SKEIN512 SHA1E SHA1 MD5E MD5 WORM URL
remote types: git gcrypt S3 bup directory rsync web bittorrent webdav tahoe glacier ddar hook external
local repository version: 5
supported repository versions: 5 6
upgrade supported from repository versions: 0 1 2 4 5
"""]]
[[!meta author=yoh]]

View file

@ -0,0 +1,7 @@
[[!comment format=mdwn
username="https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4"
subject="submodules of the submodules"
date="2016-02-08T16:05:18Z"
content="""
replacing broken link seems to work but then for submodules within those submodules I run into similar problems. While looking into it, could you please check that it works within submodules of the submodules (and so on)? ;)
"""]]

View file

@ -0,0 +1,7 @@
[[!comment format=mdwn
username="https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4"
subject="comment 2"
date="2016-02-08T16:21:57Z"
content="""
the initial issue seems to relate to invoking initial git annex command within a subdirectory of a submodule, so it sticks then too many ../.. into the path of .git. I was being able to successfully acquire content within submodule and submodule of submodule whenever initial annex command was within the top dir of the submodule (now just need to resolve accumulated chaos in an existing repository) ;-)
"""]]