From: "René Scharfe" <rene.scharfe@lsrfire.ath.cx>
To: Francis Moreau <francis.moro@gmail.com>
Cc: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Subject: Re: Why doesn't git-apply remove empty file
Date: Wed, 13 Aug 2008 23:52:58 +0200 [thread overview]
Message-ID: <48A357BA.8060003@lsrfire.ath.cx> (raw)
In-Reply-To: <38b2ab8a0808130048t506dbb7ah1d6fcd6bd4f3c90c@mail.gmail.com>
Francis Moreau schrieb:
> $ mkdir a b
> $ date > a/f
> $ diff -Nurp a/f b/f
> --- a/f 2008-08-13 09:27:29.000000000 +0200
> +++ b/f 1970-01-01 01:00:00.000000000 +0100
> @@ -1 +0,0 @@
> -Wed Aug 13 09:27:29 CEST 2008
>
> So '/dev/null' doesn't appear here. I think patch(1) uses the date of
> b/f for removing
> the file.
>
> If we keep going on:
>
> $ diff -Nurp a b > test.patch
> $ ( cd a && git apply ../test.patch )
> $ ls a
> f
> $ cat a/f
> $
>
> of course patch(1) does remove the file.
I bet you are using GNU patch. It removes files that are empty after
patching and you need to specify --posix to make it keep empty files.
Larry Wall's original version of patch keeps empty files by default and
you need to use the option option -E (or --remove-empty-files) to make
it remove them.
René
next prev parent reply other threads:[~2008-08-13 21:54 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-08-12 16:17 Why doesn't git-apply remove empty file Francis Moreau
2008-08-13 0:25 ` Junio C Hamano
2008-08-13 7:48 ` Francis Moreau
2008-08-13 21:52 ` René Scharfe [this message]
2008-08-13 23:09 ` Linus Torvalds
2008-08-14 19:42 ` Francis Moreau
2008-08-14 19:57 ` Linus Torvalds
2008-08-14 20:02 ` Linus Torvalds
2008-08-14 20:21 ` Stephan Beyer
2008-08-14 20:54 ` Jeff King
2008-08-14 21:10 ` Stephan Beyer
2008-08-15 4:08 ` Jeff King
2008-08-15 15:53 ` Linus Torvalds
2008-08-14 20:17 ` Francis Moreau
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=48A357BA.8060003@lsrfire.ath.cx \
--to=rene.scharfe@lsrfire.ath.cx \
--cc=francis.moro@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.