git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Kevin Shanahan <kmshanah@disenchant.net>
To: git@vger.kernel.org
Subject: Re: Problem with git-apply?
Date: Sat, 4 Nov 2006 18:37:51 +1030	[thread overview]
Message-ID: <20061104080751.GB19667@cubit> (raw)
In-Reply-To: <20061104072349.GA19667@cubit>

On Sat, Nov 04, 2006 at 05:53:49PM +1030, Kevin Shanahan wrote:
> 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.

> #!/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,

  parent reply	other threads:[~2006-11-04  8:08 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-11-04  7:23 Problem with git-apply? Kevin Shanahan
2006-11-04  7:30 ` Shawn Pearce
2006-11-04  8:07 ` Kevin Shanahan [this message]
2006-11-04  9:26 ` Jakub Narebski
2006-11-04 10:12   ` Kevin Shanahan
2006-11-04  9:49 ` Junio C Hamano
2006-11-04 10:00   ` Junio C Hamano
2006-11-04 10:15     ` Junio C Hamano
2006-11-04 10:49       ` Kevin Shanahan
2006-11-04 16:27   ` Linus Torvalds
2006-11-04 18:33     ` Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20061104080751.GB19667@cubit \
    --to=kmshanah@disenchant.net \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).