On Fri, Aug 03, 2007 at 02:56:01PM +0200, Pierre Habouzit wrote: > Okay, as I was pissed I downgraded git-core, and it still failed. In > fact, it happens that for whatever reason I had a file named ';' created > in my .git/ directory, and it made everything go bersek.
Hi Pierre, this doesn't reproduce for me: $ mkdir repo && cd $_ $ git init Initialized empty Git repository in .git/ $ touch foo && git add foo && git commit -m foo foo Created initial commit 1f4491f: foo 0 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 foo $ echo bar >foo && git commit -m bar foo Created commit 742fbea: bar 1 files changed, 1 insertions(+), 0 deletions(-) $ git format-patch HEAD^ 0001-bar.patch $ git reset --hard HEAD^ HEAD is now at 1f4491f... foo $ echo baz >.git/\; $ git am <0001-bar.patch Applying bar Wrote tree 6a09c59ce8eb1b5b4f89450103e67ff9b3a3b1ae Committed: a2034cf8323ee22c8780317e84bf74d316b870b0 $ ls -l .git/ total 48 -rw-r--r-- 1 pape pape 4 Aug 3 14:40 ; -rw-r--r-- 1 pape pape 23 Aug 3 14:38 HEAD -rw-r--r-- 1 pape pape 41 Aug 3 14:40 ORIG_HEAD drwxr-xr-x 2 pape pape 4096 Aug 3 14:38 branches -rw-r--r-- 1 pape pape 92 Aug 3 14:38 config -rw-r--r-- 1 pape pape 58 Aug 3 14:38 description drwxr-xr-x 2 pape pape 4096 Aug 3 14:38 hooks -rw-r--r-- 1 pape pape 137 Aug 3 14:40 index drwxr-xr-x 2 pape pape 4096 Aug 3 14:38 info drwxr-xr-x 3 pape pape 4096 Aug 3 14:39 logs drwxr-xr-x 11 pape pape 4096 Aug 3 14:40 objects drwxr-xr-x 4 pape pape 4096 Aug 3 14:38 refs $ Can you post a test case where git-am fails for you? Thanks, Gerrit. -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
