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

This commit is contained in:
Joey Hess 2013-04-22 16:42:09 -04:00
commit 9ca9c1f747
3 changed files with 60 additions and 0 deletions

View file

@ -0,0 +1,37 @@
**What steps will reproduce the problem?**
On the dashboard, click settings > Delete on the repo you want to remove.
Wait for the dropping to finish.
Start final deletion when the message "The repository "repo" has been emptied, and can now be removed." pops up.
**What is the expected output? What do you see instead?**
The repository should be deleted, but I only see "Internal Server Error: git [Param "remote",Param "remove",Param "repo"] failed".
**What version of git-annex are you using? On what operating system?**
Standalone build, git-annex version 4.20130417-g4bb97d5
**Please provide any additional information below.**
The log shows:
[2013-04-22 22:17:22 CEST] TransferScanner: The repository "repo" has been emptied, and can now be removed.
error: Unknown subcommand: remove
usage: git remote [-v | --verbose]
or: git remote add [-t <branch>] [-m <master>] [-f] [--mirror=<fetch|push>] <name> <url>
or: git remote rename <old> <new>
or: git remote rm <name>
or: git remote set-head <name> (-a | -d | <branch>)
or: git remote [-v | --verbose] show [-n] <name>
or: git remote prune [-n | --dry-run] <name>
or: git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]
or: git remote set-branches [--add] <name> <branch>...
or: git remote set-url <name> <newurl> [<oldurl>]
or: git remote set-url --add <name> <newurl>
or: git remote set-url --delete <name> <url>
-v, --verbose be verbose; must be placed before a subcommand

View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawnSenxKyE_2Z6Wb-EBMO8FciyRywjx1ZiQ"
nickname="Walter"
subject="comment 2"
date="2013-04-22T20:37:59Z"
content="""
That looks like exactly what I'm after!
I'm very impressed by the quick response. Keep up the great work!
"""]]

View file

@ -0,0 +1,13 @@
[[!comment format=mdwn
username="http://joeyh.name/"
nickname="joey"
subject="comment 1"
date="2013-04-22T20:00:12Z"
content="""
1. Use `git log --stat` to find the commit that changed your file `Z.7z`
2. Use `git revert` to revert that commit
That will put things back the way they were.
You should then investigate what caused the bad commit to be made. It seems to have involved the file being reset to be 0 bytes in size.
"""]]