Merge remote-tracking branch 'branchable/master'

This commit is contained in:
Joey Hess 2011-04-02 22:30:29 -04:00
commit a79436d9ea
5 changed files with 44 additions and 0 deletions

View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="http://joey.kitenet.net/"
nickname="joey"
subject="comment 1"
date="2011-04-03T01:37:29Z"
content="""
That is displayed by rsync. It's not unheard of for rsync to resume a transfer and display extremely high speeds.
"""]]

View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="http://joey.kitenet.net/"
nickname="joey"
subject="comment 1"
date="2011-04-03T01:46:16Z"
content="""
Have you seen [[walkthrough/recover_data_from_lost+found]]? The method described there will also work in this scenario.
"""]]

View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="http://joey.kitenet.net/"
nickname="joey"
subject="comment 1"
date="2011-04-03T01:40:50Z"
content="""
They rely on git-ls-files to get a list of files that are checked into git, in order to tell what to unannex.
"""]]

View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="http://joey.kitenet.net/"
nickname="joey"
subject="comment 1"
date="2011-04-03T02:26:20Z"
content="""
I'm not sure how this happened, as far as I can see, and based on my testing, `git annex upgrade` does stage the location log files. OTOH, I vaguely rememeber needing to stage some of them when I was doing my own upgrades, but that was a while ago, and I don't remember the details.
Your upgrade seems to have gone ok from the file lists you sent, so you can just: `git add .git-annex; git commit`
"""]]

View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="http://joey.kitenet.net/"
nickname="joey"
subject="comment 3"
date="2011-04-03T01:48:57Z"
content="""
For future reference, git can recover from a corrupted index file with `rm .git/index; git reset --mixed`.
Of course, you lose any staged changes that were in the old index file, and may need to re-stage some files.
"""]]