Merge branch 'master' of ssh://git-annex.branchable.com
This commit is contained in:
Joey Hess
commit
53b302d755
14 changed files with 634 additions and 0 deletions
|
|
@ -0,0 +1,387 @@
|
||||||
|
### Please describe the problem.
|
||||||
|
Using the assistant on two computers to setup a shared encrypted repository (while sharing the same pgp key) on a third computer leads to files not propagating between one and two.
|
||||||
|
|
||||||
|
The first and second computer does not get changes done on the other. If new files are added on the first computer it appears as if everything works (no error messages) but the files never reach the second computer (and vice versa).
|
||||||
|
|
||||||
|
|
||||||
|
### What steps will reproduce the problem?
|
||||||
|
|
||||||
|
Three computers needed.
|
||||||
|
|
||||||
|
* Computer A: Use the assistant to create a repository
|
||||||
|
* Computer A: Use the assitant to setup a remote repository on Computer C (Add another repository - Remote server - Encrypt with GnuPG key/Encript repository with a new encryption key - Save changes)
|
||||||
|
|
||||||
|
[At this point files propagate from A to C]
|
||||||
|
|
||||||
|
* Computer A: Export the private and public gpg keys to files
|
||||||
|
* Computer B: Import these private and public gpg files, fix trust to ultimate
|
||||||
|
* Computer B: Use the assistant to create a repository
|
||||||
|
* Computer B: Use the assitant to connect with the remote repository on Computer C (Add another repository - Remote server - Combine the repositories)
|
||||||
|
|
||||||
|
[Files created on A before adding B now appear on B]
|
||||||
|
|
||||||
|
[New files created on A do not appear on B, new files created on B do not appear on A. Files from A and B seem to propagate to C (the number of files/directories in the object sub directory on C goes up after adding files on A or B)]
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
### What version of git-annex are you using? On what operating system?
|
||||||
|
Computer A:
|
||||||
|
[[!format sh """
|
||||||
|
dirk@A:~$ lsb_release -a
|
||||||
|
No LSB modules are available.
|
||||||
|
Distributor ID: Ubuntu
|
||||||
|
Description: Ubuntu 14.04.1 LTS
|
||||||
|
Release: 14.04
|
||||||
|
Codename: trusty
|
||||||
|
dirk@A:~$ git-annex version
|
||||||
|
git-annex version: 5.20140818-g10bf03a
|
||||||
|
build flags: Assistant Webapp Webapp-secure Pairing Testsuite S3 WebDAV Inotify DBus DesktopNotify XMPP DNS Feeds Quvi TDFA CryptoHash
|
||||||
|
key/value backends: SHA256E SHA1E SHA512E SHA224E SHA384E SKEIN256E SKEIN512E SHA256 SHA1 SHA512 SHA224 SHA384 SKEIN256 SKEIN512 WORM URL
|
||||||
|
remote types: git gcrypt S3 bup directory rsync web webdav tahoe glacier ddar hook external
|
||||||
|
local repository version: 5
|
||||||
|
supported repository version: 5
|
||||||
|
upgrade supported from repository versions: 0 1 2 4
|
||||||
|
dirk@A:~$
|
||||||
|
|
||||||
|
dirk@A:~$ gpg --list-keys --list-options show-uid-validity
|
||||||
|
/home/dirk/.gnupg/pubring.gpg
|
||||||
|
-----------------------------
|
||||||
|
pub 4096R/0A7AA2A4 2014-08-23
|
||||||
|
uid [ultimate] dirk's git-annex encryption key
|
||||||
|
|
||||||
|
dirk@A:~$ gpg --list-secret-keys --list-options show-uid-validity
|
||||||
|
/home/dirk/.gnupg/secring.gpg
|
||||||
|
-----------------------------
|
||||||
|
sec 4096R/0A7AA2A4 2014-08-23
|
||||||
|
uid dirk's git-annex encryption key
|
||||||
|
|
||||||
|
dirk@A:~$
|
||||||
|
"""]]
|
||||||
|
|
||||||
|
Computer B:
|
||||||
|
[[!format sh """
|
||||||
|
dirk@B:~$ lsb_release -a
|
||||||
|
No LSB modules are available.
|
||||||
|
Distributor ID: Ubuntu
|
||||||
|
Description: Ubuntu 14.04.1 LTS
|
||||||
|
Release: 14.04
|
||||||
|
Codename: trusty
|
||||||
|
dirk@B:~$ git-annex version
|
||||||
|
git-annex version: 5.20140818-g10bf03a
|
||||||
|
build flags: Assistant Webapp Webapp-secure Pairing Testsuite S3 WebDAV Inotify DBus DesktopNotify XMPP DNS Feeds Quvi TDFA CryptoHash
|
||||||
|
key/value backends: SHA256E SHA1E SHA512E SHA224E SHA384E SKEIN256E SKEIN512E SHA256 SHA1 SHA512 SHA224 SHA384 SKEIN256 SKEIN512 WORM URL
|
||||||
|
remote types: git gcrypt S3 bup directory rsync web webdav tahoe glacier ddar hook external
|
||||||
|
dirk@B:~$
|
||||||
|
|
||||||
|
dirk@B:~$ gpg --list-keys --list-options show-uid-validity
|
||||||
|
/home/dirk/.gnupg/pubring.gpg
|
||||||
|
-----------------------------
|
||||||
|
pub 4096R/0A7AA2A4 2014-08-23
|
||||||
|
uid [ultimate] dirk's git-annex encryption key
|
||||||
|
|
||||||
|
dirk@B:~$ gpg --list-secret-keys --list-options show-uid-validity
|
||||||
|
/home/dirk/.gnupg/secring.gpg
|
||||||
|
-----------------------------
|
||||||
|
sec 4096R/0A7AA2A4 2014-08-23
|
||||||
|
uid dirk's git-annex encryption key
|
||||||
|
|
||||||
|
dirk@B:~$
|
||||||
|
"""]]
|
||||||
|
|
||||||
|
Computer C:
|
||||||
|
[[!format sh """
|
||||||
|
dirk@C:~$ lsb_release -a
|
||||||
|
No LSB modules are available.
|
||||||
|
Distributor ID: Debian
|
||||||
|
Description: Debian GNU/Linux 7.6 (wheezy)
|
||||||
|
Release: 7.6
|
||||||
|
Codename: wheezy
|
||||||
|
dirk@C:~$ git-annex version
|
||||||
|
git-annex version: 5.20140717~bpo70+1
|
||||||
|
build flags: Assistant Webapp Pairing S3 Inotify DBus XMPP Feeds Quvi TDFA
|
||||||
|
key/value backends: SHA256E SHA1E SHA512E SHA224E SHA384E SHA256 SHA1 SHA512 SHA224 SHA384 WORM URL
|
||||||
|
remote types: git gcrypt S3 bup directory rsync web tahoe glacier ddar hook external
|
||||||
|
dirk@C:~$
|
||||||
|
"""]]
|
||||||
|
|
||||||
|
### Please provide any additional information below.
|
||||||
|
|
||||||
|
.git/annex/daemon.log - Computer A
|
||||||
|
[[!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
|
||||||
|
[2014-08-23 15:15:01 CEST] main: starting assistant version 5.20140818-g10bf03a
|
||||||
|
[2014-08-23 15:15:01 CEST] Cronner: You should enable consistency checking to protect your data.
|
||||||
|
(scanning...) [2014-08-23 15:15:01 CEST] Watcher: Performing startup scan
|
||||||
|
(started...)
|
||||||
|
gpg: new configuration file `/home/dirk/.gnupg/gpg.conf' created
|
||||||
|
gpg: WARNING: options in `/home/dirk/.gnupg/gpg.conf' are not yet active during this run
|
||||||
|
|
||||||
|
Not enough random bytes available. Please do some other work to give
|
||||||
|
the OS a chance to collect more entropy! (Need 235 more bytes)
|
||||||
|
....+++++
|
||||||
|
|
||||||
|
Not enough random bytes available. Please do some other work to give
|
||||||
|
the OS a chance to collect more entropy! (Need 196 more bytes)
|
||||||
|
.......+++++
|
||||||
|
gpg: /home/dirk/.gnupg/trustdb.gpg: trustdb created
|
||||||
|
gpg: key 0A7AA2A4 marked as ultimately trusted
|
||||||
|
Generating public/private rsa key pair.
|
||||||
|
Your identification has been saved in /tmp/git-annex-keygen.0/key.
|
||||||
|
Your public key has been saved in /tmp/git-annex-keygen.0/key.pub.
|
||||||
|
The key fingerprint is:
|
||||||
|
7d:02:34:56:d4:86:b6:e5:82:b0:d9:4f:3b:51:b3:c7 dirk@A
|
||||||
|
The key's randomart image is:
|
||||||
|
+--[ RSA 2048]----+
|
||||||
|
| +ooo |
|
||||||
|
| .o .o * |
|
||||||
|
| =.o * + |
|
||||||
|
| o oo= o E |
|
||||||
|
| Soo+.. |
|
||||||
|
| +o |
|
||||||
|
| . |
|
||||||
|
| |
|
||||||
|
| |
|
||||||
|
+-----------------+
|
||||||
|
(encryption setup) (hybrid cipher with gpg key 7815EA570A7AA2A4) gcrypt: Development version -- Repository format MAY CHANGE
|
||||||
|
gpg: checking the trustdb
|
||||||
|
gpg: 3 marginal(s) needed, 1 complete(s) needed, PGP trust model
|
||||||
|
gpg: depth: 0 valid: 1 signed: 0 trust: 0-, 0q, 0n, 0m, 0f, 1u
|
||||||
|
gcrypt: Repository not found: ssh://dirk@git-annex-C-dirk_1022_annex/~/annex/
|
||||||
|
gcrypt: Development version -- Repository format MAY CHANGE
|
||||||
|
gcrypt: Repository not found: ssh://dirk@git-annex-C-dirk_1022_annex/~/annex/
|
||||||
|
gcrypt: Setting up new repository
|
||||||
|
gcrypt: Remote ID is :id:00RaA3cNQu+nZDMERYMM
|
||||||
|
gcrypt: Encrypting to: -r 7815EA570A7AA2A4
|
||||||
|
gcrypt: Requesting manifest signature
|
||||||
|
To gcrypt::ssh://dirk@git-annex-C-dirk_1022_annex/~/annex/
|
||||||
|
* [new branch] git-annex -> git-annex
|
||||||
|
ok
|
||||||
|
[2014-08-23 15:25:46 CEST] main: Syncing with C_annex
|
||||||
|
gcrypt: Development version -- Repository format MAY CHANGE
|
||||||
|
gcrypt: Decrypting manifest
|
||||||
|
gpg: Signature made Sat 23 Aug 2014 03:25:45 PM CEST using RSA key ID 0A7AA2A4
|
||||||
|
gpg: Good signature from "dirk's git-annex encryption key"
|
||||||
|
(Recording state in git...)
|
||||||
|
gcrypt: Development version -- Repository format MAY CHANGE
|
||||||
|
gcrypt: Decrypting manifest
|
||||||
|
gpg: Signature made Sat 23 Aug 2014 03:25:45 PM CEST using RSA key ID 0A7AA2A4
|
||||||
|
gpg: Good signature from "dirk's git-annex encryption key"
|
||||||
|
gcrypt: Encrypting to: -r 7815EA570A7AA2A4
|
||||||
|
gcrypt: Requesting manifest signature
|
||||||
|
To gcrypt::ssh://dirk@git-annex-C-dirk_1022_annex/~/annex/
|
||||||
|
* [new branch] git-annex -> synced/git-annex
|
||||||
|
* [new branch] annex/direct/master -> synced/master
|
||||||
|
[2014-08-23 15:26:46 CEST] Pusher: Syncing with C_annex
|
||||||
|
gcrypt: Development version -- Repository format MAY CHANGE
|
||||||
|
gcrypt: Decrypting manifest
|
||||||
|
gpg: Signature made Sat 23 Aug 2014 03:25:49 PM CEST using RSA key ID 0A7AA2A4
|
||||||
|
gpg: Good signature from "dirk's git-annex encryption key"
|
||||||
|
Everything up-to-date
|
||||||
|
[2014-08-23 15:34:01 CEST] Committer: Adding hhhhn.txt
|
||||||
|
add hhhhn.txt ok
|
||||||
|
add hhhhn.txt ok
|
||||||
|
[2014-08-23 15:34:01 CEST] Committer: Committing changes to git
|
||||||
|
(Recording state in git...)
|
||||||
|
[2014-08-23 15:34:01 CEST] Pusher: Syncing with C_annex
|
||||||
|
(Recording state in git...)
|
||||||
|
gcrypt: Development version -- Repository format MAY CHANGE
|
||||||
|
(gpg)
|
||||||
|
GPGHMACSHA1--7a46226ea53e4043cb45e8df6a2382ac2696164e
|
||||||
|
|
||||||
|
74 100% 0.00kB/s 0:00:00
|
||||||
|
74 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1)
|
||||||
|
[2014-08-23 15:34:01 CEST] Transferrer: Uploaded hhhhn.txt
|
||||||
|
gcrypt: Decrypting manifest
|
||||||
|
gpg: Signature made Sat 23 Aug 2014 03:33:27 PM CEST using RSA key ID 0A7AA2A4
|
||||||
|
gpg: Good signature from "dirk's git-annex encryption key"
|
||||||
|
gcrypt: WARNING:
|
||||||
|
gcrypt: WARNING: Remote ID has changed!
|
||||||
|
gcrypt: WARNING: from :id:00RaA3cNQu+nZDMERYMM
|
||||||
|
gcrypt: WARNING: to :id:h/BFJbR+mE8CEkASZ/tx
|
||||||
|
gcrypt: WARNING:
|
||||||
|
gcrypt: Encrypting to: -r 7815EA570A7AA2A4
|
||||||
|
gcrypt: Requesting manifest signature
|
||||||
|
To gcrypt::ssh://dirk@git-annex-C-dirk_1022_annex/~/annex/
|
||||||
|
85b70d6..e1d6871 annex/direct/master -> synced/master
|
||||||
|
+ 99dc810...a7a89ff git-annex -> synced/git-annex (forced update)
|
||||||
|
[2014-08-23 15:34:07 CEST] Pusher: Syncing with C_annex
|
||||||
|
(Recording state in git...)
|
||||||
|
gcrypt: Development version -- Repository format MAY CHANGE
|
||||||
|
gcrypt: Decrypting manifest
|
||||||
|
gpg: Signature made Sat 23 Aug 2014 03:34:04 PM CEST using RSA key ID 0A7AA2A4
|
||||||
|
gpg: Good signature from "dirk's git-annex encryption key"
|
||||||
|
gcrypt: Encrypting to: -r 7815EA570A7AA2A4
|
||||||
|
gcrypt: Requesting manifest signature
|
||||||
|
To gcrypt::ssh://dirk@git-annex-C-dirk_1022_annex/~/annex/
|
||||||
|
a7a89ff..e68b5a9 git-annex -> synced/git-annex
|
||||||
|
[2014-08-23 15:48:30 CEST] main: warning git-annex has been shut down
|
||||||
|
# End of transcript or log.
|
||||||
|
"""]]
|
||||||
|
|
||||||
|
.git/annex/daemon.log - Computer B
|
||||||
|
[[!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
|
||||||
|
[2014-08-23 15:30:11 CEST] main: starting assistant version 5.20140818-g10bf03a
|
||||||
|
[2014-08-23 15:30:11 CEST] Cronner: You should enable consistency checking to protect your data.
|
||||||
|
|
||||||
|
dbus failed; falling back to mtab polling (ClientError {clientErrorMessage = "runClient: unable to determine DBUS address", clientErrorFatal = True})
|
||||||
|
|
||||||
|
No known network monitor available through dbus; falling back to polling
|
||||||
|
(scanning...) [2014-08-23 15:30:11 CEST] Watcher: Performing startup scan
|
||||||
|
(started...)
|
||||||
|
Generating public/private rsa key pair.
|
||||||
|
Your identification has been saved in /tmp/git-annex-keygen.0/key.
|
||||||
|
Your public key has been saved in /tmp/git-annex-keygen.0/key.pub.
|
||||||
|
The key fingerprint is:
|
||||||
|
b5:c3:6b:af:fc:fe:82:f2:a6:f3:42:e9:50:4b:63:9e dirk@A
|
||||||
|
The key's randomart image is:
|
||||||
|
+--[ RSA 2048]----+
|
||||||
|
| |
|
||||||
|
| |
|
||||||
|
| . |
|
||||||
|
| =o . |
|
||||||
|
| =S=+ |
|
||||||
|
| . E o |
|
||||||
|
| + o. |
|
||||||
|
| =oo.. |
|
||||||
|
| .O=++o. |
|
||||||
|
+-----------------+
|
||||||
|
gcrypt: Development version -- Repository format MAY CHANGE
|
||||||
|
gcrypt: Decrypting manifest
|
||||||
|
gpg: Signature made Sat 23 Aug 2014 03:25:49 PM CEST using RSA key ID 0A7AA2A4
|
||||||
|
gpg: checking the trustdb
|
||||||
|
gpg: 3 marginal(s) needed, 1 complete(s) needed, PGP trust model
|
||||||
|
gpg: depth: 0 valid: 1 signed: 0 trust: 0-, 0q, 0n, 0m, 0f, 1u
|
||||||
|
gpg: Good signature from "dirk's git-annex encryption key"
|
||||||
|
gcrypt: Remote ID is :id:00RaA3cNQu+nZDMERYMM
|
||||||
|
gcrypt: Development version -- Repository format MAY CHANGE
|
||||||
|
gcrypt: Decrypting manifest
|
||||||
|
gpg: Signature made Sat 23 Aug 2014 03:25:49 PM CEST using RSA key ID 0A7AA2A4
|
||||||
|
gpg: Good signature from "dirk's git-annex encryption key"
|
||||||
|
gcrypt: Remote ID is :id:00RaA3cNQu+nZDMERYMM
|
||||||
|
Receiving objects: 14% (1/7)
|
||||||
|
Receiving objects: 28% (2/7)
|
||||||
|
Receiving objects: 42% (3/7)
|
||||||
|
Receiving objects: 57% (4/7)
|
||||||
|
Receiving objects: 71% (5/7)
|
||||||
|
Receiving objects: 85% (6/7)
|
||||||
|
Receiving objects: 100% (7/7)
|
||||||
|
Receiving objects: 100% (7/7), done.
|
||||||
|
Receiving objects: 12% (1/8)
|
||||||
|
Receiving objects: 25% (2/8)
|
||||||
|
Receiving objects: 37% (3/8)
|
||||||
|
Receiving objects: 50% (4/8)
|
||||||
|
Receiving objects: 62% (5/8)
|
||||||
|
Receiving objects: 75% (6/8)
|
||||||
|
Receiving objects: 87% (7/8)
|
||||||
|
Receiving objects: 100% (8/8)
|
||||||
|
Receiving objects: 100% (8/8), done.
|
||||||
|
From gcrypt::ssh://dirk@git-annex-C-dirk_1022_annex/~/annex
|
||||||
|
* [new branch] git-annex -> tmpgcryptremote/git-annex
|
||||||
|
* [new branch] synced/git-annex -> tmpgcryptremote/synced/git-annex
|
||||||
|
* [new branch] synced/master -> tmpgcryptremote/synced/master
|
||||||
|
* [new branch] master -> tmpgcryptremote/master
|
||||||
|
(merging tmpgcryptremote/git-annex tmpgcryptremote/synced/git-annex into git-annex...)
|
||||||
|
(Recording state in git...)
|
||||||
|
(encryption update) (hybrid cipher with gpg key 7815EA570A7AA2A4) gcrypt: Development version -- Repository format MAY CHANGE
|
||||||
|
gcrypt: Decrypting manifest
|
||||||
|
gpg: Signature made Sat 23 Aug 2014 03:25:49 PM CEST using RSA key ID 0A7AA2A4
|
||||||
|
gpg: Good signature from "dirk's git-annex encryption key"
|
||||||
|
gcrypt: Remote ID is :id:00RaA3cNQu+nZDMERYMM
|
||||||
|
From gcrypt::ssh://dirk@git-annex-C-dirk_1022_annex/~/annex
|
||||||
|
* [new branch] git-annex -> C_annex/git-annex
|
||||||
|
* [new branch] synced/git-annex -> C_annex/synced/git-annex
|
||||||
|
* [new branch] synced/master -> C_annex/synced/master
|
||||||
|
* [new branch] master -> C_annex/master
|
||||||
|
gcrypt: Development version -- Repository format MAY CHANGE
|
||||||
|
gcrypt: Decrypting manifest
|
||||||
|
gpg: Signature made Sat 23 Aug 2014 03:25:49 PM CEST using RSA key ID 0A7AA2A4
|
||||||
|
gpg: Good signature from "dirk's git-annex encryption key"
|
||||||
|
gcrypt: Encrypting to: -r 7815EA570A7AA2A4
|
||||||
|
gcrypt: Requesting manifest signature
|
||||||
|
remote: error: denying non-fast-forward refs/heads/master (you should pull first)
|
||||||
|
To ssh://dirk@git-annex-C-dirk_1022_annex/~/annex/
|
||||||
|
! [remote rejected] refs/gcrypt/gitception+ -> master (non-fast-forward)
|
||||||
|
error: failed to push some refs to 'ssh://dirk@git-annex-C-dirk_1022_annex/~/annex/'
|
||||||
|
error: failed to push some refs to 'gcrypt::ssh://dirk@git-annex-C-dirk_1022_annex/~/annex/'
|
||||||
|
ok
|
||||||
|
[2014-08-23 15:31:36 CEST] main: Syncing with C_annex
|
||||||
|
|
||||||
|
Automatic merge went well; stopped before committing as requested
|
||||||
|
Already up-to-date!
|
||||||
|
gcrypt: Development version -- Repository format MAY CHANGE
|
||||||
|
[2014-08-23 15:31:37 CEST] Pusher: Syncing with C_annex
|
||||||
|
(Recording state in git...)
|
||||||
|
gcrypt: Development version -- Repository format MAY CHANGE
|
||||||
|
gcrypt: Decrypting manifest
|
||||||
|
gcrypt: Repository not found: ssh://dirk@git-annex-C-dirk_1022_annex/~/annex/
|
||||||
|
gcrypt: Setting up new repository
|
||||||
|
gpg: Signature made Sat 23 Aug 2014 03:25:49 PM CEST using RSA key ID 0A7AA2A4
|
||||||
|
gpg: Good signature from "dirk's git-annex encryption key"
|
||||||
|
fatal: ambiguous argument 'refs/heads/synced/master..refs/remotes/C_annex/synced/master': unknown revision or path not in the working tree.
|
||||||
|
Use '--' to separate paths from revisions, like this:
|
||||||
|
'git <command> [<revision>...] -- [<file>...]'
|
||||||
|
gcrypt: Development version -- Repository format MAY CHANGE
|
||||||
|
gcrypt: Remote ID is :id:h/BFJbR+mE8CEkASZ/tx
|
||||||
|
gcrypt: Encrypting to: -r 7815EA570A7AA2A4
|
||||||
|
gcrypt: Requesting manifest signature
|
||||||
|
gcrypt: Decrypting manifest
|
||||||
|
gpg: Signature made Sat 23 Aug 2014 03:25:49 PM CEST using RSA key ID 0A7AA2A4
|
||||||
|
gpg: Good signature from "dirk's git-annex encryption key"
|
||||||
|
gcrypt: Encrypting to: -r 7815EA570A7AA2A4
|
||||||
|
gcrypt: Requesting manifest signature
|
||||||
|
To gcrypt::ssh://dirk@git-annex-C-dirk_1022_annex/~/annex/
|
||||||
|
* [new branch] git-annex -> synced/git-annex
|
||||||
|
* [new branch] annex/direct/master -> synced/master
|
||||||
|
fatal: Not a valid object name refs/gcrypt/gitception+
|
||||||
|
To gcrypt::ssh://dirk@git-annex-C-dirk_1022_annex/~/annex/
|
||||||
|
5d2eb63..e4763b8 git-annex -> synced/git-annex
|
||||||
|
da18915..3068bad annex/direct/master -> synced/master
|
||||||
|
[2014-08-23 15:32:37 CEST] Pusher: Syncing with C_annex
|
||||||
|
gcrypt: Development version -- Repository format MAY CHANGE
|
||||||
|
gcrypt: Decrypting manifest
|
||||||
|
gpg: Signature made Sat 23 Aug 2014 03:31:43 PM CEST using RSA key ID 0A7AA2A4
|
||||||
|
gpg: Good signature from "dirk's git-annex encryption key"
|
||||||
|
gcrypt: WARNING:
|
||||||
|
gcrypt: WARNING: Remote ID has changed!
|
||||||
|
gcrypt: WARNING: from :id:00RaA3cNQu+nZDMERYMM
|
||||||
|
gcrypt: WARNING: to :id:h/BFJbR+mE8CEkASZ/tx
|
||||||
|
gcrypt: WARNING:
|
||||||
|
Everything up-to-date
|
||||||
|
[2014-08-23 15:33:17 CEST] Committer: Adding fmksmxxs.txt
|
||||||
|
add fmksmxxs.txt ok
|
||||||
|
add fmksmxxs.txt ok
|
||||||
|
[2014-08-23 15:33:18 CEST] Committer: Committing changes to git
|
||||||
|
(Recording state in git...)
|
||||||
|
[2014-08-23 15:33:18 CEST] Pusher: Syncing with C_annex
|
||||||
|
(Recording state in git...)
|
||||||
|
gcrypt: Development version -- Repository format MAY CHANGE
|
||||||
|
(gpg) gcrypt: Decrypting manifest
|
||||||
|
gpg: Signature made Sat 23 Aug 2014 03:31:43 PM CEST using RSA key ID 0A7AA2A4
|
||||||
|
gpg: Good signature from "dirk's git-annex encryption key"
|
||||||
|
gcrypt: Encrypting to: -r 7815EA570A7AA2A4
|
||||||
|
gcrypt: Requesting manifest signature
|
||||||
|
|
||||||
|
GPGHMACSHA1--f605f108429ffba3058a2fcf0bc006a1fbe600be
|
||||||
|
|
||||||
|
70 100% 0.00kB/s 0:00:00
|
||||||
|
70 100% 0.00kB/s 0:00:00 (xfr#1, to-chk=0/1)
|
||||||
|
[2014-08-23 15:33:20 CEST] Transferrer: Uploaded fmksmxxs.txt
|
||||||
|
To gcrypt::ssh://dirk@git-annex-C-dirk_1022_annex/~/annex/
|
||||||
|
e4763b8..85dbfc5 git-annex -> synced/git-annex
|
||||||
|
3068bad..85b70d6 annex/direct/master -> synced/master
|
||||||
|
[2014-08-23 15:33:25 CEST] Pusher: Syncing with C_annex
|
||||||
|
(Recording state in git...)
|
||||||
|
gcrypt: Development version -- Repository format MAY CHANGE
|
||||||
|
gcrypt: Decrypting manifest
|
||||||
|
gpg: Signature made Sat 23 Aug 2014 03:33:22 PM CEST using RSA key ID 0A7AA2A4
|
||||||
|
gpg: Good signature from "dirk's git-annex encryption key"
|
||||||
|
gcrypt: Encrypting to: -r 7815EA570A7AA2A4
|
||||||
|
gcrypt: Requesting manifest signature
|
||||||
|
To gcrypt::ssh://dirk@git-annex-C-dirk_1022_annex/~/annex/
|
||||||
|
85dbfc5..99dc810 git-annex -> synced/git-annex
|
||||||
|
[2014-08-23 15:48:39 CEST] main: warning git-annex has been shut down
|
||||||
|
# End of transcript or log.
|
||||||
|
"""]]
|
||||||
|
|
@ -0,0 +1,16 @@
|
||||||
|
[[!comment format=mdwn
|
||||||
|
username="Hans_Ryding"
|
||||||
|
ip="81.229.194.7"
|
||||||
|
subject="Quite right"
|
||||||
|
date="2014-08-21T08:54:50Z"
|
||||||
|
content="""
|
||||||
|
Incorrect assumption from my part.
|
||||||
|
I reinstalled git into the expected path (C:\program files\Git)
|
||||||
|
and the problem is still there.
|
||||||
|
|
||||||
|
Running git-annex from command-line works.
|
||||||
|
(I tried running git-annex test. It had 23 failed tests,
|
||||||
|
most of them because of inability to access the remote: origin.
|
||||||
|
But it ran just fine.)
|
||||||
|
Running the web-app gives the error listed above.
|
||||||
|
"""]]
|
||||||
|
|
@ -0,0 +1,9 @@
|
||||||
|
[[!comment format=mdwn
|
||||||
|
username="Hans_Ryding"
|
||||||
|
ip="81.229.194.7"
|
||||||
|
subject="Change the name of the bug"
|
||||||
|
date="2014-08-21T09:14:16Z"
|
||||||
|
content="""
|
||||||
|
I can't seem to change the name of the bug to something more appropriate.
|
||||||
|
Maybe you can?
|
||||||
|
"""]]
|
||||||
|
|
@ -0,0 +1,22 @@
|
||||||
|
### Please describe the problem.
|
||||||
|
After having added new content (SHA1E backend), when trying to commit, git commit fails with the following error:
|
||||||
|
|
||||||
|
[[!format sh """
|
||||||
|
(Recording state in git...)
|
||||||
|
error: invalid object 100644 5d471129a031f0f493de3736eaea6f2f4056aeee for '000/091/WORM-s1493-m1321288671--scrapbook%data%20111114173520%horiz-menu-tab-r_001.png.log'
|
||||||
|
fatal: git-write-tree: error building trees
|
||||||
|
git-annex: failed to read sha from git write-tree
|
||||||
|
"""]]
|
||||||
|
|
||||||
|
The commit subsequently fails and the index is left as is. When I did git-annex add, I got the same error, but the additions seem to have been staged, at least.
|
||||||
|
|
||||||
|
What’s curious about this is that I migrated all keys to SHA1E earlier and dropped all WORM keys. git annex info also says that all my keys are SHA1E.
|
||||||
|
|
||||||
|
Can this be related to your changes to the WORM backend? I upgraded to git-annex 5.20140818 today. Rolling back to 5.20140716 didn’t allow me to commit, either, though.
|
||||||
|
|
||||||
|
Any way I could resolve this? I don’t want to git reset for now, since this will leave the added objects in the annex store.
|
||||||
|
|
||||||
|
### What version of git-annex are you using? On what operating system?
|
||||||
|
git-annex 5.20140818
|
||||||
|
|
||||||
|
Linux 3.16.1
|
||||||
|
|
@ -0,0 +1,35 @@
|
||||||
|
[[!comment format=mdwn
|
||||||
|
username="zardoz"
|
||||||
|
ip="78.48.163.229"
|
||||||
|
subject="comment 1"
|
||||||
|
date="2014-08-22T09:27:34Z"
|
||||||
|
content="""
|
||||||
|
git fsck only shows a few dangling blobs from a branch I did earlier and left behind, but otherwise reports no errors.
|
||||||
|
|
||||||
|
git annex fsck --fast ultimately fails with the original error message at some point:
|
||||||
|
|
||||||
|
[[!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
|
||||||
|
|
||||||
|
# nx fsck --fast|egrep -v 'ok$'
|
||||||
|
[2014-08-22 11:14:43 CEST] read: git [\"--git-dir=/home/seb/Webmirror/.git\",\"--work-tree=/home/seb/Webmirror\",\"ls-files\",\"--cached\",\"-z\",\"--\"]
|
||||||
|
[2014-08-22 11:14:43 CEST] chat: git [\"--git-dir=/home/seb/Webmirror/.git\",\"--work-tree=/home/seb/Webmirror\",\"check-attr\",\"-z\",\"--stdin\",\"annex.backend\",\"annex.numcopies\",\"--\"]
|
||||||
|
[2014-08-22 11:14:43 CEST] read: git [\"--git-dir=/home/seb/Webmirror/.git\",\"--work-tree=/home/seb/Webmirror\",\"show-ref\",\"git-annex\"]
|
||||||
|
[2014-08-22 11:14:43 CEST] read: git [\"--git-dir=/home/seb/Webmirror/.git\",\"--work-tree=/home/seb/Webmirror\",\"show-ref\",\"--hash\",\"refs/heads/git-annex\"]
|
||||||
|
[2014-08-22 11:14:43 CEST] read: git [\"--git-dir=/home/seb/Webmirror/.git\",\"--work-tree=/home/seb/Webmirror\",\"log\",\"refs/heads/git-annex..dda9b068ac5c075e79ab63a531770ad772ae8491\",\"-n1\",\"--pretty=%H\"]
|
||||||
|
[2014-08-22 11:14:43 CEST] chat: git [\"--git-dir=/home/seb/Webmirror/.git\",\"--work-tree=/home/seb/Webmirror\",\"cat-file\",\"--batch\"]
|
||||||
|
[2014-08-22 11:25:24 CEST] chat: git [\"--git-dir=/home/seb/Webmirror/.git\",\"--work-tree=/home/seb/Webmirror\",\"hash-object\",\"-w\",\"--stdin-paths\",\"--no-filters\"]
|
||||||
|
[2014-08-22 11:25:24 CEST] feed: git [\"--git-dir=/home/seb/Webmirror/.git\",\"--work-tree=/home/seb/Webmirror\",\"update-index\",\"-z\",\"--index-info\"]
|
||||||
|
[2014-08-22 11:25:24 CEST] read: git [\"--git-dir=/home/seb/Webmirror/.git\",\"--work-tree=/home/seb/Webmirror\",\"show-ref\",\"--hash\",\"refs/heads/git-annex\"]
|
||||||
|
[2014-08-22 11:25:24 CEST] read: git [\"--git-dir=/home/seb/Webmirror/.git\",\"--work-tree=/home/seb/Webmirror\",\"write-tree\"]
|
||||||
|
error: invalid object 100644 5d471129a031f0f493de3736eaea6f2f4056aeee for '000/091/WORM-s1493-m1321288671--scrapbook%data%20111114173520%horiz-menu-tab-r_001.png.log'
|
||||||
|
fatal: git-write-tree: error building trees
|
||||||
|
git-annex: failed to read sha from git write-tree
|
||||||
|
(Recording state in git...)
|
||||||
|
|
||||||
|
# End of transcript or log.
|
||||||
|
\"\"\"]]
|
||||||
|
|
||||||
|
|
||||||
|
"""]]
|
||||||
|
|
@ -0,0 +1,30 @@
|
||||||
|
[[!comment format=mdwn
|
||||||
|
username="zardoz"
|
||||||
|
ip="78.48.163.229"
|
||||||
|
subject="comment 2"
|
||||||
|
date="2014-08-22T09:38:03Z"
|
||||||
|
content="""
|
||||||
|
git commit with git-annex debug output enabled:
|
||||||
|
|
||||||
|
|
||||||
|
[[!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
|
||||||
|
|
||||||
|
[2014-08-22 11:36:46 CEST] read: git [\"--git-dir=/home/seb/Webmirror/.git\",\"--work-tree=/home/seb/Webmirror\",\"diff\",\"--cached\",\"--name-only\",\"-z\",\"--diff-filter=ACMRT\",\"--\",\".\"]
|
||||||
|
[2014-08-22 11:36:46 CEST] read: git [\"--git-dir=/home/seb/Webmirror/.git\",\"--work-tree=/home/seb/Webmirror\",\"diff\",\"--name-only\",\"--diff-filter=T\",\"-z\",\"--cached\",\"--\",\".\"]
|
||||||
|
[2014-08-22 11:36:46 CEST] read: git [\"--git-dir=/home/seb/Webmirror/.git\",\"--work-tree=/home/seb/Webmirror\",\"symbolic-ref\",\"HEAD\"]
|
||||||
|
[2014-08-22 11:36:46 CEST] read: git [\"--git-dir=/home/seb/Webmirror/.git\",\"--work-tree=/home/seb/Webmirror\",\"show-ref\",\"refs/heads/master\"]
|
||||||
|
[2014-08-22 11:36:46 CEST] chat: git [\"--git-dir=/home/seb/Webmirror/.git\",\"--work-tree=/home/seb/Webmirror\",\"hash-object\",\"-w\",\"--stdin-paths\",\"--no-filters\"]
|
||||||
|
[2014-08-22 11:36:46 CEST] feed: git [\"--git-dir=/home/seb/Webmirror/.git\",\"--work-tree=/home/seb/Webmirror\",\"update-index\",\"-z\",\"--index-info\"]
|
||||||
|
[2014-08-22 11:36:46 CEST] read: git [\"--git-dir=/home/seb/Webmirror/.git\",\"--work-tree=/home/seb/Webmirror\",\"show-ref\",\"--hash\",\"refs/heads/git-annex\"]
|
||||||
|
(Recording state in git...)
|
||||||
|
[2014-08-22 11:36:46 CEST] read: git [\"--git-dir=/home/seb/Webmirror/.git\",\"--work-tree=/home/seb/Webmirror\",\"write-tree\"]
|
||||||
|
error: invalid object 100644 5d471129a031f0f493de3736eaea6f2f4056aeee for '000/091/WORM-s1493-m1321288671--scrapbook%data%20111114173520%horiz-menu-tab-r_001.png.log'
|
||||||
|
fatal: git-write-tree: error building trees
|
||||||
|
git-annex: failed to read sha from git write-tree
|
||||||
|
|
||||||
|
# End of transcript or log.
|
||||||
|
\"\"\"]]
|
||||||
|
|
||||||
|
"""]]
|
||||||
|
|
@ -0,0 +1,27 @@
|
||||||
|
[[!comment format=mdwn
|
||||||
|
username="zardoz"
|
||||||
|
ip="78.48.163.229"
|
||||||
|
subject="comment 3"
|
||||||
|
date="2014-08-22T09:58:05Z"
|
||||||
|
content="""
|
||||||
|
Doing a git annex fsck on a new clone of the repository succeded; the problem must somehow with the .git/annex/index then, I presume?
|
||||||
|
|
||||||
|
I did a git reset to restore to the sane state state before adding, but the problem is that I cannot unannex the files I added. :(
|
||||||
|
|
||||||
|
[[!format sh \"\"\"
|
||||||
|
nx unannex scrapbook/data/20140822101558/1.jpg
|
||||||
|
[2014-08-22 11:56:16 CEST] read: git [\"--git-dir=/home/seb/Webmirror/.git\",\"--work-tree=/home/seb/Webmirror\",\"show-ref\",\"--head\"]
|
||||||
|
[2014-08-22 11:56:16 CEST] read: git [\"--git-dir=/home/seb/Webmirror/.git\",\"--work-tree=/home/seb/Webmirror\",\"diff-index\",\"-z\",\"--raw\",\"--no-renames\",\"-l0\",\"--cached\",\"HEAD\"]
|
||||||
|
[2014-08-22 11:56:16 CEST] read: git [\"--git-dir=/home/seb/Webmirror/.git\",\"--work-tree=/home/seb/Webmirror\",\"ls-files\",\"--cached\",\"-z\",\"--\",\"scrapbook/data/20140822101558/1.jpg\"]
|
||||||
|
[2014-08-22 11:56:16 CEST] call: git [\"--git-dir=/home/seb/Webmirror/.git\",\"--work-tree=/home/seb/Webmirror\",\"commit\",\"-q\",\"--allow-empty\",\"--no-verify\",\"-m\",\"content removed from git annex\"]
|
||||||
|
[2014-08-22 11:56:16 CEST] chat: git [\"--git-dir=/home/seb/Webmirror/.git\",\"--work-tree=/home/seb/Webmirror\",\"hash-object\",\"-w\",\"--stdin-paths\",\"--no-filters\"]
|
||||||
|
[2014-08-22 11:56:16 CEST] feed: git [\"--git-dir=/home/seb/Webmirror/.git\",\"--work-tree=/home/seb/Webmirror\",\"update-index\",\"-z\",\"--index-info\"]
|
||||||
|
[2014-08-22 11:56:16 CEST] read: git [\"--git-dir=/home/seb/Webmirror/.git\",\"--work-tree=/home/seb/Webmirror\",\"show-ref\",\"--hash\",\"refs/heads/git-annex\"]
|
||||||
|
(Recording state in git...)
|
||||||
|
[2014-08-22 11:56:16 CEST] read: git [\"--git-dir=/home/seb/Webmirror/.git\",\"--work-tree=/home/seb/Webmirror\",\"write-tree\"]
|
||||||
|
error: invalid object 100644 5d471129a031f0f493de3736eaea6f2f4056aeee for '000/091/WORM-s1493-m1321288671--scrapbook%data%20111114173520%horiz-menu-tab-r_001.png.log'
|
||||||
|
fatal: git-write-tree: error building trees
|
||||||
|
git-annex: failed to read sha from git write-tree
|
||||||
|
\"\"\"]]
|
||||||
|
|
||||||
|
"""]]
|
||||||
|
|
@ -0,0 +1,16 @@
|
||||||
|
[[!comment format=mdwn
|
||||||
|
username="zardoz"
|
||||||
|
ip="78.48.163.229"
|
||||||
|
subject="comment 4"
|
||||||
|
date="2014-08-22T10:15:51Z"
|
||||||
|
content="""
|
||||||
|
The file referred to in the error message seems to be in good shape:
|
||||||
|
|
||||||
|
[[!format sh \"\"\"
|
||||||
|
git --no-pager show git-annex:000/091/WORM-s1493-m1321288671--scrapbook%data%20111114173520%horiz-menu-tab-r_001.png.log
|
||||||
|
1408605730.57892s 0 b25f42de-f4be-4d31-84d1-ab0b71dfec01
|
||||||
|
1408562938.526946s 0 e148ea91-0eb6-4f47-86e9-db2136a15279
|
||||||
|
\"\"\"]]
|
||||||
|
|
||||||
|
Strangely, the SHA1 of the blob is different from the one reported in the write-tree error.
|
||||||
|
"""]]
|
||||||
|
|
@ -0,0 +1,8 @@
|
||||||
|
[[!comment format=mdwn
|
||||||
|
username="zardoz"
|
||||||
|
ip="78.48.163.229"
|
||||||
|
subject="comment 5"
|
||||||
|
date="2014-08-22T13:07:34Z"
|
||||||
|
content="""
|
||||||
|
I remembered I keep an hourly snapshot regimen and was able to get back the repository from before doing the «add» this morning. Both git fsck and git annex fsck return no errors, and yet, whenever anything is done to the git-annex branch (I tried add and forget), I get the above error.
|
||||||
|
"""]]
|
||||||
|
|
@ -0,0 +1,15 @@
|
||||||
|
[[!comment format=mdwn
|
||||||
|
username="zardoz"
|
||||||
|
ip="78.48.163.229"
|
||||||
|
subject="comment 6"
|
||||||
|
date="2014-08-22T13:15:06Z"
|
||||||
|
content="""
|
||||||
|
I tried git annex repair on the repo (before doing any adds). It reports no fsck errors, but the repair then dies from a stack overflow.
|
||||||
|
|
||||||
|
[[!format sh \"\"\"
|
||||||
|
Running git fsck ...
|
||||||
|
No problems found.
|
||||||
|
Stack space overflow: current size 8388608 bytes.
|
||||||
|
Use `+RTS -Ksize -RTS' to increase it.
|
||||||
|
\"\"\"]]
|
||||||
|
"""]]
|
||||||
|
|
@ -0,0 +1,8 @@
|
||||||
|
[[!comment format=mdwn
|
||||||
|
username="zardoz"
|
||||||
|
ip="78.48.163.229"
|
||||||
|
subject="comment 7"
|
||||||
|
date="2014-08-22T14:00:42Z"
|
||||||
|
content="""
|
||||||
|
I experimented on my snapshot a bit and found out something odd: When I reset the git-annex branch from dda9b06 to git-annex~1 (4246f73) my local file additions succeed, even though git-annex will fast-forward the branch to dda9b06 again before adding (when merging from origin/git-annex). dda9b06 is a large commit in which I dropped many unused WORM keys from another remote.
|
||||||
|
"""]]
|
||||||
|
|
@ -0,0 +1,8 @@
|
||||||
|
[[!comment format=mdwn
|
||||||
|
username="zardoz"
|
||||||
|
ip="78.48.163.229"
|
||||||
|
subject="comment 8"
|
||||||
|
date="2014-08-22T18:57:37Z"
|
||||||
|
content="""
|
||||||
|
I just checked my other large git annex repo and noticed that here too I could no longer add files to the annex. The same observations as above apply. Here too on the tip of the git-anenx branch I had one huge commit in which I dropped the last of the unused WORM keys from another remote. Resetting the git-annex branch to git-annex~1 allowed me to make additions again, even though the reset tip was subsequently merged in again from the remote tracking branch.
|
||||||
|
"""]]
|
||||||
14
doc/bugs/webapp_missing_on_redhat.mdwn
Normal file
14
doc/bugs/webapp_missing_on_redhat.mdwn
Normal file
|
|
@ -0,0 +1,14 @@
|
||||||
|
### Please describe the problem.
|
||||||
|
I am unable to run the webapp on redhat6.5
|
||||||
|
|
||||||
|
### What steps will reproduce the problem?
|
||||||
|
yum install git-annex
|
||||||
|
|
||||||
|
### What version of git-annex are you using? On what operating system?
|
||||||
|
I am using git-annex version 3.20120523 and on redhat 6.5
|
||||||
|
|
||||||
|
### Please provide any additional information below.
|
||||||
|
I am seeing the following error when running git annex webapp:
|
||||||
|
|
||||||
|
git-annex: unknown command webapp
|
||||||
|
|
||||||
|
|
@ -0,0 +1,39 @@
|
||||||
|
I recently migrated some of my repositories from WORM to SHA1E, and
|
||||||
|
noticed after finishing conversion and dropping all WORM keys that
|
||||||
|
there are some stale files and directories left over in the
|
||||||
|
.git/annex/objects directory. These seem to fall into two categories:
|
||||||
|
|
||||||
|
1. There are some empty directories meant for WORM-keys. Strangely, I
|
||||||
|
don’t believe the content of these keys has ever been present on this
|
||||||
|
machine, and the corresponding .log files do not contain the local
|
||||||
|
UUID. What might be the deal with those?
|
||||||
|
|
||||||
|
Another set of empty WORM directories housed content I unannexed and
|
||||||
|
checked into regular git on my other remote, and then pulled locally.
|
||||||
|
A subsequent «dropunused» seems to have left the empty directories
|
||||||
|
after dropping their content.
|
||||||
|
|
||||||
|
I suppose the stale directories can be safely pruned away?
|
||||||
|
|
||||||
|
One thing I noticed is that, while the terminal leaf in the objects
|
||||||
|
directory is usually sticky (mode +t), the stale directories to
|
||||||
|
content I unannexed are all non-sticky. Maybe this gives some
|
||||||
|
indication where things got stuck? A few (though not all) of the other
|
||||||
|
terminal directories are non-sticky, as well.
|
||||||
|
|
||||||
|
2. There are some .map and .cache files leftover in
|
||||||
|
.git/annex/objects. This is an indirect repository, but I briefly
|
||||||
|
switched it to direct once. The stale files seem to belong to content
|
||||||
|
with which I had some difficulties when «git annex add»’ing the files
|
||||||
|
(I recall I had to add them multiple times before they were correctly
|
||||||
|
indexed). I now examined these files again and noticed they were
|
||||||
|
tracked via regular git. I «git rm»’ed them and readded them into the
|
||||||
|
annex. Can the stale .cache and .map files be safely deleted?
|
||||||
|
|
||||||
|
I noticed some of these keys have the format
|
||||||
|
«WORM-s123-m-123456789--name», with an additional dash before the
|
||||||
|
mtime. Has there been a format change, or does this indicate a
|
||||||
|
problem?
|
||||||
|
|
||||||
|
Best regards,
|
||||||
|
Z.
|
||||||
Loading…
Add table
Add a link
Reference in a new issue