Re: Problem with git-apply?

From: Kevin Shanahan <kmshanah@disenchant.net>
Date: Nov 4, 2006, 08:07 UTC
Message-ID: <20061104080751.GB19667@cubit>
In-Reply-To: <20061104072349.GA19667@cubit>

On Sat, Nov 04, 2006 at 05:53:49PM +1030, Kevin Shanahan wrote:

Show 6 quoted lines

> I seem to be having problems using git-apply to apply any patch which
> creates a new file. Unfortunately it's been a few weeks since I last
> used git here locally, but this seems like some behaviour change since
> the last version I was using. I'm currently using version 1.4.3.3 from
> Debian Sid. This little test script demonstrates the problem I'm
> having:

Sorry, I probably should have said to CC me, as I'm not subscribed.

Thanks for your reply Shawn, but --index doesn't seem to make any difference. If it helps, I can confirm that the script works fine with version 1.4.1.1.

Show 27 quoted lines

> #!/bin/sh
> 
> mkdir a b repo
> echo foo > b/foo
> diff -urN a b > test.diff
> 
> (
>     cd repo
>     echo bar > bar # need something to init the db
>     git init-db
>     git add .
>     git commit -a -m "Test Commit"
> 
>     git apply ../test.diff
>     git commit -a -m "Test Commit (file added)"
> )
> 
> Here, this outputs for me:
> 
> defaulting to local storage area
> Committing initial tree ee314a31b622b027c10981acaed7903a3607dbd4
> error: foo: No such file or directory
> nothing to commit
> 
> Has something broken or am I doing something wrong here?
> 
> Thanks,