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

This commit is contained in:
Joey Hess 2012-08-31 13:09:15 -04:00
commit cc88d2991a
3 changed files with 62 additions and 0 deletions

View file

@ -0,0 +1,46 @@
**What steps will reproduce the problem?**
stone@skynet ~/annex $ git init
Initialized empty Git repository in /home/stone/annex/.git/
stone@skynet ~/annex $ git annex init "work"
init work
*** Please tell me who you are.
Run
git config --global user.email "you@example.com"
git config --global user.name "Your Name"
to set your account's default identity.
Omit --global to set the identity only in this repository.
fatal: empty ident name (for <stone@skynet>) not allowed
git-annex: git ["--git-dir=/home/stone/annex/.git","--work-tree=/home/stone/annex","commit-tree","4b825dc652cb6eb9a060e64bf8d69288fbee4904"] exited 128
stone@skynet ~/annex $ git config -l
user.email=stone@nospam.hu
user.name=Stone
core.editor=nano
color.ui=auto
core.repositoryformatversion=0
core.filemode=true
core.bare=false
core.logallrefupdates=true
annex.uuid=499fb545-0b98-4bfc-816c-fb3704f3aaa0
stone@skynet ~/annex $ cat ~/.gitconfig
[user]
email = stone@nospam.hu
name = Stone
[core]
editor = nano
[color]
ui = auto
stone@skynet ~/annex $
**What is the expected output? What do you see instead?**
**What version of git-annex are you using? On what operating system?**
commit 56c037c69e75def74d6ea90de8aa8a1954c52178 Arch Linux
**Please provide any additional information below.**

View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="4.152.246.16"
subject="comment 1"
date="2012-08-31T15:04:09Z"
content="""
This is an error message from git. [Git faq](https://git.wiki.kernel.org/index.php/GitFaq#Git_commit_is_dying_telling_me_.22fatal:_empty_ident_.3Cuser.40myhost.3E_not_allowed.22.2C_what.27s_wrong.3F). I don't understand why git is doing it given the configuration shown, but I suppose it would do the same thing if you run git commit by hand.
"""]]

View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawmU_2tE75oyG0h2ZPN4lcroIKEMC8G-otE"
nickname="Michael"
subject="comment 4"
date="2012-08-31T08:04:18Z"
content="""
Success! Now it compiles fine on Ubuntu 12.04 with make. Thank you.
"""]]