On Fri, Aug 03, 2007 at 05:00:47PM +0200, Pierre Habouzit wrote: > On Fri, Aug 03, 2007 at 02:43:18PM +0000, Gerrit Pape wrote: > > Hi Pierre, this doesn't reproduce for me: > > > [...] > > > > Can you post a test case where git-am fails for you? > > in fact it does not seems related to ';' at all. I had a spurious file > named ';', I removed it, and then it worked, so I assumed .. but it > seems to fail again: > > ┌─(16:47)──── > └[artemis] sh > sh-3.1$ mkdir tmp > sh-3.1$ cd tmp > sh-3.1$ git init > Initialized empty Git repository in .git/ > sh-3.1$ echo "toto" > a > sh-3.1$ git add a > sh-3.1$ git commit -a -s -m'foo' > Created initial commit 987d76b: foo > 1 files changed, 1 insertions(+), 0 deletions(-) > create mode 100644 a > sh-3.1$ echo "toto" >> a > sh-3.1$ git commit -a -s -m'bar' > Created commit 10e6e20: bar > 1 files changed, 1 insertions(+), 0 deletions(-) > sh-3.1$ git format-patch HEAD~1 > 0001-bar.patch > sh-3.1$ git reset --hard HEAD~1 > HEAD is now at 987d76b... foo > sh-3.1$ git am 0001-bar.patch > sed: can't read .dotest/info: No such file or directory > sed: can't read .dotest/info: No such file or directory > sed: can't read .dotest/info: No such file or directory > Patch does not have a valid e-mail address. > sh-3.1$ > > Here is the same with unstable's git: > > ┌─(16:53)──── > └[artemis] sh > sh-3.1$ mkdir tmp > sh-3.1$ cd tmp > sh-3.1$ git init > Initialized empty Git repository in .git/ > sh-3.1$ echo "toto" > a > sh-3.1$ git add a > sh-3.1$ git commit -a -s -m'foo' > Created initial commit c4b1047: foo > 1 files changed, 1 insertions(+), 0 deletions(-) > create mode 100644 a > sh-3.1$ echo "toto" >> a > sh-3.1$ git commit -a -s -m'bar' > Created commit faa183e: bar > 1 files changed, 1 insertions(+), 0 deletions(-) > sh-3.1$ git format-patch HEAD~1 > 0001-bar.patch > sh-3.1$ git reset --hard HEAD~1 > > HEAD is now at c4b1047... foo > sh-3.1$ git am 0001-bar.patch > sed: can't read .dotest/info: No such file or directory > sed: can't read .dotest/info: No such file or directory > sed: can't read .dotest/info: No such file or directory > Patch does not have a valid e-mail address. > > > So I guess there is an issue with my env, checking every variable > right now.
Ookay, for some reason, I have resume set to /dev/sda5 ... and well, git-am uses resume. I *HATE* sh for that. If you have _any_ idea of what could clutter my env, you'd be welcomed. -- ·O· Pierre Habouzit ··O [EMAIL PROTECTED] OOO http://www.madism.org
pgpC7JuzkNYRr.pgp
Description: PGP signature
