Merge branch 'master' of ssh://git-annex.branchable.com
This commit is contained in:
Joey Hess
commit
cf1f7eb185
10 changed files with 406 additions and 0 deletions
|
|
@ -0,0 +1,12 @@
|
|||
[[!comment format=mdwn
|
||||
username="https://www.google.com/accounts/o8/id?id=AItOawnNqLKszWk9EoD4CDCqNXJRIklKFBCN1Ao"
|
||||
nickname="maurizio"
|
||||
subject="comment 7"
|
||||
date="2013-11-23T13:16:10Z"
|
||||
content="""
|
||||
OK, sorry but it will be difficult to provide you with a copy of this repository. I hope I can still help in spite of being only a very novice git user. I checked that the git-annex:uuid.log file at the first commit was identical to the one above. The only difference is that in this first commit file there is a mention at the bottom of who created the file (me@somedomain.com) with the mention \"created repository\".
|
||||
|
||||
So it is very possible that these nonexisting remotes are present since day 1. It is possible that I did not notice it earlier (I am not sure I had ever run git annex status in this repository since I am looking for a dropbox-like experience). What triggered my curiosity was the difficulty I had to get some data. At that point it might be that there are two independent problems. One with these nonexisting repositories, and another one with the fact that I cannot get some data in this client.
|
||||
|
||||
Would it be useful to you to have the full history (52 revisions) of the git-annex:uuid.log file?
|
||||
"""]]
|
||||
|
|
@ -0,0 +1,23 @@
|
|||
[[!comment format=mdwn
|
||||
username="http://nicolas-schodet.myopenid.com/"
|
||||
ip="81.56.19.53"
|
||||
subject="comment 2"
|
||||
date="2013-11-23T14:38:21Z"
|
||||
content="""
|
||||
Here are the files in details:
|
||||
|
||||
[[!format sh \"\"\"
|
||||
Umba:.../.git$ ls -ld $(find . -name SHA256-s2819887-\*) # the bad file
|
||||
drwxr-xr-t 4 marie-eve staff 136 Aug 17 17:05 ./annex/objects/wq/3j/SHA256-s2819887--987f9811d7b5c7a287a74b7adbb852be4d18eeda61c3507f4e08c534d2356f4c/
|
||||
-rw-r--r-- 1 marie-eve staff 560 Nov 23 15:25 ./annex/objects/wq/3j/SHA256-s2819887--987f9811d7b5c7a287a74b7adbb852be4d18eeda61c3507f4e08c534d2356f4c/SHA256-s2819887--987f9811d7b5c7a287a74b7adbb852be4d18eeda61c3507f4e08c534d2356f4c.cache
|
||||
-rw------- 1 marie-eve staff 33 Aug 17 17:05 ./annex/objects/wq/3j/SHA256-s2819887--987f9811d7b5c7a287a74b7adbb852be4d18eeda61c3507f4e08c534d2356f4c/SHA256-s2819887--987f9811d7b5c7a287a74b7adbb852be4d18eeda61c3507f4e08c534d2356f4c.map
|
||||
-rw-r--r-- 1 marie-eve staff 52 Aug 17 17:06 ./annex/transfer/failed/download/13fd5d5a-ed97-11e2-9178-574d3b1c0618/SHA256-s2819887--987f9811d7b5c7a287a74b7adbb852be4d18eeda61c3507f4e08c534d2356f4c
|
||||
-rw-r--r-- 1 marie-eve staff 51 Aug 17 10:13 ./annex/transfer/failed/download/95443f2e-ed96-11e2-9d3f-8ffa5b1aae7a/SHA256-s2819887--987f9811d7b5c7a287a74b7adbb852be4d18eeda61c3507f4e08c534d2356f4c
|
||||
Umba:.../.git$ ls -ld $(find . -name SHA256-s5066556-\*) # a good file
|
||||
dr-xr-xr-x 3 marie-eve staff 102 Nov 23 15:27 ./annex/objects/Fx/w0/SHA256-s5066556--0e4a47efdc14c884d07c017ba5506a56affb136d87bef5700145774fd9089f25/
|
||||
-r--r--r-- 1 marie-eve staff 5066556 Nov 6 17:43 ./annex/objects/Fx/w0/SHA256-s5066556--0e4a47efdc14c884d07c017ba5506a56affb136d87bef5700145774fd9089f25/SHA256-s5066556--0e4a47efdc14c884d07c017ba5506a56affb136d87bef5700145774fd9089
|
||||
Umba:.../.git$
|
||||
\"\"\"]]
|
||||
|
||||
No more idea on how it reached this situation.
|
||||
"""]]
|
||||
|
|
@ -0,0 +1,16 @@
|
|||
[[!comment format=mdwn
|
||||
username="http://nicolas-schodet.myopenid.com/"
|
||||
ip="81.56.19.53"
|
||||
subject="comment 3"
|
||||
date="2013-11-23T15:42:26Z"
|
||||
content="""
|
||||
The link seems to be special:
|
||||
|
||||
[[!format sh \"\"\"
|
||||
Umba:2013-07-31$ ls -lO 2013-07-31_180411.jpg
|
||||
lrwxr-xr-x 1 marie-eve staff uchg 191 Aug 12 21:45 2013-07-31_180411.jpg@ -> ../.git/annex/objects/wq/3j/SHA256-s2819887--987f9811d7b5c7a287a74b7adbb852be4d18eeda61c3507f4e08c534d2356f4c/SHA256-s2819887--987f9811d7b5c7a287a74b7adbb852be4d18eeda61c3507f4e08c534d2356f4c
|
||||
Umba:2013-07-31$
|
||||
\"\"\"]]
|
||||
|
||||
I tried the chflags command with no success... I suppose I need a MAC specialist.
|
||||
"""]]
|
||||
54
doc/bugs/repair_fails_when_home_on_seperate_partition.mdwn
Normal file
54
doc/bugs/repair_fails_when_home_on_seperate_partition.mdwn
Normal file
|
|
@ -0,0 +1,54 @@
|
|||
### Please describe the problem.
|
||||
|
||||
|
||||
### What steps will reproduce the problem?
|
||||
|
||||
(1) Place a broken repo on a different mount point than the root partition.
|
||||
|
||||
(2) Run
|
||||
git annex repair.
|
||||
|
||||
### What version of git-annex are you using? On what operating system?
|
||||
|
||||
5.20131118-gc7e5cde on Ubuntu 12.04
|
||||
|
||||
### 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
|
||||
|
||||
$ git annex repair --force
|
||||
|
||||
Running git fsck ...
|
||||
git fsck found 74 broken objects.
|
||||
Unpacking all pack files.
|
||||
Unpacking objects: 100% (2307/2307), done.
|
||||
Unpacking objects: 100% (241565/241565), done.
|
||||
Re-running git fsck to see if it finds more problems.
|
||||
Initialized empty Git repository in /tmp/tmprepo.0/.git/
|
||||
Trying to recover missing objects from remote pi.fritz.box__var_lib_store_annex
|
||||
Trying to recover missing objects from remote pi.fritz.box__var_lib_store_annex
|
||||
74 missing objects could not be recovered!
|
||||
|
||||
|
||||
Deleted remote branch pi.fritz.box__var_lib_store_annex/master (was dffa056).
|
||||
error: Could not read 4e01bbdc7ce31247ad66ab13ca46925ac2c8db9a
|
||||
fatal: Failed to traverse parents of commit 718525a48b4d6b3404eda5e189332d73c968a2be
|
||||
Deleted remote branch pi.fritz.box__var_lib_store_annex/synced/git-annex (was 718525a).
|
||||
Deleted remote branch pi.fritz.box__var_lib_store_annex/synced/master (was 9aedf69).
|
||||
Deleted remote branch pi.fritz.box_annex/synced/master (was 92b1042).
|
||||
Deleted remote branch store/master (was b059380).
|
||||
removed 5 remote tracking branches that referred to missing objects
|
||||
fatal: bad object refs/heads/git-annex
|
||||
fatal: bad object refs/heads/git-annex
|
||||
fatal: bad object refs/heads/git-annex
|
||||
error: remote branch 'git-annex' not found.
|
||||
|
||||
git-annex: /tmp/packed-refs19813: rename: unsupported operation (Invalid cross-device link)
|
||||
failed
|
||||
git-annex: repair: 1 failed
|
||||
|
||||
|
||||
# End of transcript or log.
|
||||
"""]]
|
||||
20
doc/bugs/test_failures_on_window_for_5.20131118.mdwn
Normal file
20
doc/bugs/test_failures_on_window_for_5.20131118.mdwn
Normal file
|
|
@ -0,0 +1,20 @@
|
|||
### Please describe the problem.
|
||||
|
||||
git annex test reports failures
|
||||
|
||||
### What steps will reproduce the problem?
|
||||
|
||||
running git annex test (from standard cmd, with: git version: 1.7.11.msysgit.1)
|
||||
|
||||
### What version of git-annex are you using? On what operating system?
|
||||
|
||||
5.20131118 from installers
|
||||
|
||||
### Please provide any additional information below.
|
||||
|
||||
operating system:
|
||||
|
||||
windows XP, NTFS = 1 FAIL
|
||||
windows 7, NTFS = 2 FAILs
|
||||
|
||||
see attachment for full log of git annex test output
|
||||
|
|
@ -0,0 +1,188 @@
|
|||
[[!comment format=mdwn
|
||||
username="https://www.google.com/accounts/o8/id?id=AItOawkJafmCf-sg9_OM0pynFYM3AO4WCgJiaMI"
|
||||
nickname="Michele"
|
||||
subject="seems i'm not allowed to attach full logs."
|
||||
date="2013-11-23T16:06:17Z"
|
||||
content="""
|
||||
here's an excerpt (the context of FAIL), hopefully i've interpreted correctely the test begin message.
|
||||
|
||||
win7:
|
||||
|
||||
unannex (with copy): Detected a filesystem without fifo support.
|
||||
Disabling ssh connection caching.
|
||||
Detected a crippled filesystem.
|
||||
Enabling direct mode.
|
||||
get foo (merging origin/git-annex into git-annex...)
|
||||
(Recording state in git...)
|
||||
(from origin...)
|
||||
foo
|
||||
20 100% 0.00kB/s 0:00:00
|
||||
20 100% 0.00kB/s 0:00:00 (xfer#1, to-check=0/1)
|
||||
|
||||
sent 87 bytes received 31 bytes 236.00 bytes/sec
|
||||
total size is 20 speedup is 0.17
|
||||
ok
|
||||
(Recording state in git...)
|
||||
unannex foo
|
||||
git-annex: M:\gitannex.test\.t\tmprepo4\.git\annex\objects\6cd\e82\SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77\SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77.map4432.tmp: MoveFileEx \"M:\\gitannex.test\\.t\\tmprepo4\\.git\\annex\\objects\\6cd\\e82\\SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77\\SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77.map4432.tmp\" \"M:\\gitannex.test\\.t\\tmprepo4\\.git\\annex\\objects\\6cd\\e82\\SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77\\SHA256E-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77.map\": permission denied (Access is denied.)
|
||||
failed
|
||||
git-annex: unannex: 1 failed
|
||||
FAIL
|
||||
|
||||
conflict_resolution (mixed directory and file): Detected a filesystem without fifo support.
|
||||
Disabling ssh connection caching.
|
||||
Detected a crippled filesystem.
|
||||
Enabling direct mode.
|
||||
Detected a filesystem without fifo support.
|
||||
Disabling ssh connection caching.
|
||||
Detected a crippled filesystem.
|
||||
Enabling direct mode.
|
||||
add conflictor (checksum...) ok
|
||||
(Recording state in git...)
|
||||
(merging origin/git-annex origin/synced/git-annex into git-annex...)
|
||||
(Recording state in git...)
|
||||
commit
|
||||
ok
|
||||
pull origin bash.exe: warning: could not find /tmp, please create!
|
||||
|
||||
ok
|
||||
push origin bash.exe: warning: could not find /tmp, please create!
|
||||
To M:/gitannex.test/.t\repo
|
||||
32fb7c0..38147e0 git-annex -> synced/git-annex
|
||||
7684984..4116595 annex/direct/master -> synced/master
|
||||
|
||||
ok
|
||||
add conflictor/subfile (checksum...) ok
|
||||
(Recording state in git...)
|
||||
(merging origin/git-annex origin/synced/git-annex into git-annex...)
|
||||
(Recording state in git...)
|
||||
commit
|
||||
ok
|
||||
pull origin bash.exe: warning: could not find /tmp, please create!
|
||||
From M:/gitannex.test/.t\repo
|
||||
7684984..4116595 master -> origin/master
|
||||
32fb7c0..38147e0 synced/git-annex -> origin/synced/git-annex
|
||||
7684984..4116595 synced/master -> origin/synced/master
|
||||
Adding conflictor/subfile
|
||||
CONFLICT (directory/file): There is a directory with name conflictor in HEAD. Adding conflictor as conflictor~refs_remotes_origin_synced_master
|
||||
Automatic merge failed; fix conflicts and then commit the result.
|
||||
Ignoring path ./conflictor.variant-cc12
|
||||
conflictor: needs merge
|
||||
[annex/direct/master 27c52e4] git-annex automatic merge conflict fix
|
||||
|
||||
|
||||
(Recording state in git...)
|
||||
|
||||
Merge conflict was automatically resolved; you may want to examine the result.
|
||||
ok
|
||||
(merging origin/synced/git-annex into git-annex...)
|
||||
(Recording state in git...)
|
||||
push origin bash.exe: warning: could not find /tmp, please create!
|
||||
To M:/gitannex.test/.t\repo
|
||||
38147e0..02916ee git-annex -> synced/git-annex
|
||||
4116595..27c52e4 annex/direct/master -> synced/master
|
||||
|
||||
ok
|
||||
commit
|
||||
ok
|
||||
pull r2 bash.exe: warning: could not find /tmp, please create!
|
||||
From ../../.t\tmprepo35
|
||||
* [new branch] annex/direct/master -> r2/annex/direct/master
|
||||
* [new branch] git-annex -> r2/git-annex
|
||||
* [new branch] master -> r2/master
|
||||
* [new branch] synced/master -> r2/synced/master
|
||||
Updating 4116595..27c52e4
|
||||
Fast-forward
|
||||
conflictor | 1 -
|
||||
conflictor/subfile | 1 +
|
||||
2 files changed, 1 insertion(+), 1 deletion(-)
|
||||
delete mode 120000 conflictor
|
||||
create mode 120000 conflictor/subfile
|
||||
Already up-to-date.
|
||||
|
||||
|
||||
|
||||
ok
|
||||
(merging r2/git-annex into git-annex...)
|
||||
FAIL
|
||||
|
||||
|
||||
windowsXP:
|
||||
|
||||
conflict_resolution (mixed directory and file): Detected a filesystem without fifo support.
|
||||
Disabling ssh connection caching.
|
||||
Detected a crippled filesystem.
|
||||
Enabling direct mode.
|
||||
Detected a filesystem without fifo support.
|
||||
Disabling ssh connection caching.
|
||||
Detected a crippled filesystem.
|
||||
Enabling direct mode.
|
||||
add conflictor (checksum...) ok
|
||||
(Recording state in git...)
|
||||
(merging origin/git-annex origin/synced/git-annex into git-annex...)
|
||||
(Recording state in git...)
|
||||
commit
|
||||
ok
|
||||
pull origin bash.exe: warning: could not find /tmp, please create!
|
||||
|
||||
ok
|
||||
push origin bash.exe: warning: could not find /tmp, please create!
|
||||
To C:/Documents and Settings/Silvia/.t\repo
|
||||
edd69f1..83c6a5a git-annex -> synced/git-annex
|
||||
bed393e..978ac14 annex/direct/master -> synced/master
|
||||
|
||||
ok
|
||||
add conflictor/subfile (checksum...) ok
|
||||
(Recording state in git...)
|
||||
(merging origin/git-annex origin/synced/git-annex into git-annex...)
|
||||
(Recording state in git...)
|
||||
commit
|
||||
ok
|
||||
pull origin bash.exe: warning: could not find /tmp, please create!
|
||||
From C:/Documents and Settings/Silvia/.t\repo
|
||||
bed393e..978ac14 master -> origin/master
|
||||
edd69f1..83c6a5a synced/git-annex -> origin/synced/git-annex
|
||||
bed393e..978ac14 synced/master -> origin/synced/master
|
||||
Adding conflictor/subfile
|
||||
CONFLICT (directory/file): There is a directory with name conflictor in HEAD. Adding conflictor as conflictor~refs_remotes_origin_synced_master
|
||||
Automatic merge failed; fix conflicts and then commit the result.
|
||||
Ignoring path ./conflictor.variant-cc12
|
||||
conflictor: needs merge
|
||||
[annex/direct/master e3e39fc] git-annex automatic merge conflict fix
|
||||
|
||||
|
||||
(Recording state in git...)
|
||||
|
||||
Merge conflict was automatically resolved; you may want to examine the result.
|
||||
ok
|
||||
(merging origin/synced/git-annex into git-annex...)
|
||||
(Recording state in git...)
|
||||
push origin bash.exe: warning: could not find /tmp, please create!
|
||||
To C:/Documents and Settings/Silvia/.t\repo
|
||||
83c6a5a..e1a1678 git-annex -> synced/git-annex
|
||||
978ac14..e3e39fc annex/direct/master -> synced/master
|
||||
|
||||
ok
|
||||
commit
|
||||
ok
|
||||
pull r2 bash.exe: warning: could not find /tmp, please create!
|
||||
From ../../.t\tmprepo35
|
||||
* [new branch] annex/direct/master -> r2/annex/direct/master
|
||||
* [new branch] git-annex -> r2/git-annex
|
||||
* [new branch] master -> r2/master
|
||||
* [new branch] synced/master -> r2/synced/master
|
||||
Updating 978ac14..e3e39fc
|
||||
Fast-forward
|
||||
conflictor | 1 -
|
||||
conflictor/subfile | 1 +
|
||||
2 files changed, 1 insertion(+), 1 deletion(-)
|
||||
delete mode 120000 conflictor
|
||||
create mode 120000 conflictor/subfile
|
||||
Already up-to-date.
|
||||
|
||||
|
||||
|
||||
ok
|
||||
(merging r2/git-annex into git-annex...)
|
||||
FAIL
|
||||
"""]]
|
||||
3
doc/forum/Some_mounted_devices_not_detected.mdwn
Normal file
3
doc/forum/Some_mounted_devices_not_detected.mdwn
Normal file
|
|
@ -0,0 +1,3 @@
|
|||
Automounted USB devices are not detected by the git-annex webapp on my Debian testing/squeeze installation, only drives with entries in /etc/fstab show up in the device list. Is there any way to tweak/get around this?
|
||||
|
||||
I'm running version 4.20131106 (couldn't manage to build the package for sid).
|
||||
|
|
@ -0,0 +1,75 @@
|
|||
[[!comment format=mdwn
|
||||
username="https://www.google.com/accounts/o8/id?id=AItOawmiqeXJtP04fzHOjXs17kHO33v7dWR2xwA"
|
||||
nickname="Jaco"
|
||||
subject="Init Script"
|
||||
date="2013-11-23T08:28:32Z"
|
||||
content="""
|
||||
Hi Joey,
|
||||
|
||||
Could you help out with writing an init.d script to safely start and stop the webapp on a headless server?
|
||||
I made an attempt below based on examples from the internet, but have no idea if it will work.
|
||||
|
||||
#!/bin/bash
|
||||
# git-annex
|
||||
# chkconfig: 345 20 80
|
||||
# description: Git Annex WebApp startup and shutdown script.
|
||||
# processname: git-annex
|
||||
|
||||
|
||||
DAEMON=git-annex webapp
|
||||
|
||||
NAME=git-annex
|
||||
DESC=\"Git Annex WebApp init script\"
|
||||
PIDFILE=/var/run/$NAME.pid
|
||||
SCRIPTNAME=/etc/init.d/$NAME
|
||||
|
||||
case \"$1\" in
|
||||
start)
|
||||
printf \"%-50s\" \"Starting $NAME...\"
|
||||
for dir in $(cat $HOME/.config/git-annex/autostart); do
|
||||
cd $dir
|
||||
PID=`$DAEMON > /dev/null 2>&1 & echo $!`
|
||||
#echo \"Saving PID\" $PID \" to \" $PIDFILE
|
||||
if [ -z $PID ]; then
|
||||
printf \"%s\n\" \"Fail\"
|
||||
else
|
||||
echo $PID > $PIDFILE
|
||||
printf \"%s\n\" \"Ok\"
|
||||
fi
|
||||
done
|
||||
;;
|
||||
status)
|
||||
printf \"%-50s\" \"Checking $NAME...\"
|
||||
if [ -f $PIDFILE ]; then
|
||||
for PID in $(cat $PIDFILE); do
|
||||
if [ -z \"`ps axf | grep ${PID} | grep -v grep`\" ]; then
|
||||
printf \"%s\n\" \"Process dead but pidfile exists\"
|
||||
else
|
||||
echo \"Running\"
|
||||
fi
|
||||
done
|
||||
else
|
||||
printf \"%s\n\" \"Service not running\"
|
||||
fi
|
||||
;;
|
||||
stop)
|
||||
printf \"%-50s\" \"Stopping $NAME\"
|
||||
if [ -f $PIDFILE ]; then
|
||||
for PID in $(cat $PIDFILE); do
|
||||
kill -HUP $PID
|
||||
printf \"%s\n\" \"Ok\"
|
||||
done
|
||||
rm -f $PIDFILE
|
||||
else
|
||||
printf \"%s\n\" \"pidfile not found\"
|
||||
fi
|
||||
;;
|
||||
restart)
|
||||
$0 stop
|
||||
$0 start
|
||||
;;
|
||||
*)
|
||||
echo \"Usage: $0 {status|start|stop|restart}\"
|
||||
exit 1
|
||||
esac
|
||||
"""]]
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
I've an external USB hard disc attached to my (fritzbox) router that is only accessible through SMB/CIFS. I'd like have all my annexed files on this drive in kind of direct-mode so that I can also access the files without git-annex.
|
||||
|
||||
I tried to put a direct-mode repo on the drive but this is painfully slow. The git-annex process than runs on my desktop and accesses the repo over SMB over the slow fritzbox over USB.
|
||||
|
||||
I'd wish that git-annex could be told to just use a (mounted) folder as a direct-mode remote.
|
||||
|
|
@ -0,0 +1,10 @@
|
|||
[[!comment format=mdwn
|
||||
username="http://joeyh.name/"
|
||||
ip="209.250.56.64"
|
||||
subject="comment 1"
|
||||
date="2013-11-23T19:03:58Z"
|
||||
content="""
|
||||
It's not clear to me what you are requesting here.
|
||||
|
||||
You seem to say that running git-annex inside a mountpoint is slow. Ok. So, what possible changes to git-annex could make it fast, given that the bottleneck is the SMB/USB?
|
||||
"""]]
|
||||
Loading…
Add table
Reference in a new issue