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

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

Browse source
This commit is contained in:
Joey Hess 2017-02-20 13:11:19 -04:00
commit 5169f84f22
No known key found for this signature in database
GPG key ID: C910D9222512E3C7
8 changed files with 176 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

56
doc/bugs/Can__39__t_use_adjusted_branch_in_v6__44___if_submodule_already_is_using_this_feature.mdwn Normal file
View file

@ -0,0 +1,56 @@
### Please describe the problem.
If a v6 submodule is using an adjusted branch, `git annex adjust --unlock` fails in its superproject.
### What steps will reproduce the problem?
[[!format sh """
#!/bin/bash
set -ex
d=$(mktemp -d)
echo "directory: $d"
cd $d
git init
git annex init --version=6
echo whatever > file
git annex add file
git commit -m "file added"
mkdir sub
cd sub
git init
git annex init --version=6
echo something > subfile
git annex add subfile
git commit -m "subfile added."
cd ..
git submodule add ./sub sub
git commit -m "submodule added"
cd sub
git annex adjust --unlock
cd ..
git annex adjust --unlock
"""]]
### What version of git-annex are you using? On what operating system?
[[!format sh """
% git annex version
git-annex version: 6.20170209+gitg16be7b5cc-1~ndall+1
build flags: Assistant Webapp Pairing Testsuite S3(multipartupload)(storageclasses) WebDAV Inotify DBus DesktopNotify ConcurrentOutput TorrentParser MagicMime 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 p2p S3 bup directory rsync web bittorrent webdav tahoe glacier ddar hook external
local repository version: unknown
supported repository versions: 3 5 6
upgrade supported from repository versions: 0 1 2 3 4 5
operating system: linux x86_64
"""]]
### Please provide any additional information below.
[[!format sh """
# If you can, paste a complete transcript of the problem occurring here.
# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log
# End of transcript or log.
"""]]
### Have you had any luck using git-annex before? (Sometimes we get tired of reading bug reports all day and a lil' positive end note does wonders)

34
doc/bugs/S3_remote___8212___un-embedding_creds__63__.mdwn Normal file
View file

@ -0,0 +1,34 @@
### Please describe the problem.
After once embedding credentials into a S3 remote, there’s no way to un-embed them.
### What steps will reproduce the problem?
1. Add a S3 remote with `embedcreds=yes`.
1. Try to set `embedcreds=no`.
1. `git annex sync` here, and in some other clone.
1. Check `git annex info my-s3-remote` for the other clone. Credentials are still embedded.
### What version of git-annex are you using? On what operating system?
6.20170101 on NixOS 16.09 (stable).
### Please provide any additional information below.
[[!format sh """
% g annex info test2 | grep '^creds'
creds: embedded in git repository (gpg encrypted)
% g annex enableremote test2 embedcreds=no
enableremote test2 (encryption update) (to gpg keys: 134164FA6FAFE075) ok
(recording state in git...)
% g annex info test2 | grep '^creds'
creds: embedded in git repository (gpg encrypted)
%
"""]]
### Have you had any luck using git-annex before? (Sometimes we get tired of reading bug reports all day and a lil' positive end note does wonders)
Yes, it’s awesome! Thank you!

57
doc/bugs/git_annex_status_fails_with_submodule_in_direct_mode.mdwn Normal file
View file

@ -0,0 +1,57 @@
### Please describe the problem.
If a submodule is in direct mode, `git annex status` fails.
Apparently the recursive inspection of submodules is done by an internal call to `git status`, which then misses a working tree in the submodule.
### What steps will reproduce the problem?
[[!format sh """
#!/bin/bash
set -ex
d=$(mktemp -d)
echo "directory: $d"
cd $d
git init
git annex init
echo whatever > file
git annex add file
git commit -m "file added"
mkdir sub
cd sub
git init
git annex init
echo something > subfile
git annex add subfile
git commit -m "subfile added."
cd ..
git submodule add ./sub sub
git commit -m "submodule added"
cd sub
git annex direct
cd ..
git annex status
"""]]
### What version of git-annex are you using? On what operating system?
[[!format sh """
% git annex version
git-annex version: 6.20170209+gitg16be7b5cc-1~ndall+1
build flags: Assistant Webapp Pairing Testsuite S3(multipartupload)(storageclasses) WebDAV Inotify DBus DesktopNotify ConcurrentOutput TorrentParser MagicMime 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 p2p S3 bup directory rsync web bittorrent webdav tahoe glacier ddar hook external
local repository version: unknown
supported repository versions: 3 5 6
upgrade supported from repository versions: 0 1 2 3 4 5
operating system: linux x86_64
"""]]
### Please provide any additional information below.
[[!format sh """
# If you can, paste a complete transcript of the problem occurring here.
# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log
# End of transcript or log.
"""]]
### Have you had any luck using git-annex before? (Sometimes we get tired of reading bug reports all day and a lil' positive end note does wonders)
Yes! I think it's a great piece of software!