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

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

Browse source
This commit is contained in:
Joey Hess 2014-01-01 17:40:10 -04:00
commit 255637ffa2
7 changed files with 86 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
doc/bugs/assistant_eats_all_CPU/comment_3_498eee32426dfbaf9bda59a7c0f6fcc9._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="209.250.56.227"
subject="comment 3"
date="2014-01-01T20:45:19Z"
content="""
Note that I have installed the backports and autobuilds on systems and run the assistant without seeing this problem, so it may be particular to the system's configuration in some way.
"""]]

10
doc/bugs/file_permissions_on___126____47__.ssh__47__config___40__windows__41__/comment_2_0dbc908984b4b5bcc1283db807e058cb._comment Normal file
View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="209.250.56.227"
subject="comment 2"
date="2014-01-01T21:03:31Z"
content="""
Did you say you're using cygwin? That would suggest that you have a ~/.ssh/config that might have been set up before you started using git-annex.
When I run the git-annex webapp at the DOS prompt, it sets up a .ssh/config with permissions that ssh doesn't dislike.
"""]]

10
doc/forum/Consistency_Check_for_S3/comment_3_ec9de6882a0eef4d2786e55b583ad020._comment Normal file
View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="209.250.56.227"
subject="comment 3"
date="2014-01-01T21:05:20Z"
content="""
Adapting an example from the man page:
`git annex fsck --incremental-schedule 30d --time-limit 1h --from S3`
"""]]

32
doc/forum/Git_Annex_Sync_Delinks_Files/comment_6_257a89f81858659c4dac4d116e7cf0a3._comment Normal file
View file

@ -0,0 +1,32 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="209.250.56.227"
subject="comment 6"
date="2014-01-01T20:59:32Z"
content="""
The ` T ` in your `git show --raw` indicates that what was a symlink has been replaced with a regular file, and this has been committed to git.
It's certainly possible to do that when using git-annex, but you have to go a bit out of your way to so shoot yourself in the foot, because normally the pre-commit hook will detect that, and fix up your commit to not change the type of the file. Something like this:
[[!format sh \"\"\"
joey@darkstar:~/tmp/r>git annex unlock foo
unlock foo (copying...) ok
joey@darkstar:~/tmp/r>git commit -a --no-verify -m oops
[master 9b63e4e] oops
1 file changed, 1 deletion(-)
rewrite foo (100%)
mode change 120000 => 100644
joey@darkstar:~/tmp/r>git show --raw
commit 9b63e4efad1f229ae7713749e9ac2d0f9c286008
Author: Joey Hess <joey@kitenet.net>
Date: Wed Jan 1 16:55:19 2014 -0400
oops
:120000 100644 ea46194... e69de29... T foo
\"\"\"]]
The fact that you seem to have made 2 commits that did this, on the 21st and 30th, makes me wonder if your .git/hooks/pre-commit does not exist, or perhaps you are making some other mistake repeatedly.
The synced/* branches never have any data that is not stored somewhere else (another branch, possibly in the remote repository), so it should always be ok to delete them.
"""]]

8
doc/forum/crashing_committers_on_files_with_special_characters_in_their_names/comment_3_90cab6d393aa09779c315d12a5e8f7d0._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="209.250.56.227"
subject="comment 3"
date="2014-01-01T20:46:18Z"
content="""
And it had nothing to do with special characters in filenames. (And is fixed.)
"""]]

10
doc/forum/how_do_i_manually_sync_my_external_drive__63__/comment_1_4fd8722cafd55b0503c802289206645a._comment Normal file
View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="209.250.56.227"
subject="comment 1"
date="2014-01-01T20:43:05Z"
content="""
Pulling location tracking data out of git is unlikely to be faster than statting a single file on the drive, unless the drive is dead slow.
If you really want to force it to use the location tracking information, use `--not --in backup`
"""]]

8
doc/todo/untracked_remotes/comment_1_ccc743554cf9270e1db5275273b28265._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U"
nickname="Richard"
subject="comment 1"
date="2014-01-01T21:32:56Z"
content="""
.
"""]]