From: Evgen Druzhynin <evgen.druzhynin@gmail.com>
To: git@vger.kernel.org
Cc: Evgen Druzhynin <evgen.druzhynin@gmail.com>
Subject: [PATCH] Git doesn't allow to apply a patch with empty filenames.
Date: Mon, 6 Jul 2015 20:16:13 +0300 [thread overview]
Message-ID: <1436202974-7624-1-git-send-email-evgen.druzhynin@gmail.com> (raw)
git-apply fails if '-p' option truncate at least one filename in patch to zero size.
This solution tries to bring closer "git-apply" to standard Linux patch tool.
Standard patch tool skip the truncated filenames and successfully applies patch.
Evgen Druzhynin (1):
Added ability to scip patch hunk with an empty file.
builtin/apply.c | 16 +++++-----------
po/bg.po | 15 ---------------
po/ca.po | 15 ---------------
po/de.po | 15 ---------------
po/fr.po | 15 ---------------
po/git.pot | 11 -----------
po/it.po | 11 -----------
po/pt_PT.po | 7 -------
po/ru.po | 12 ------------
po/sv.po | 16 ----------------
po/vi.po | 12 ------------
po/zh_CN.po | 11 -----------
12 files changed, 5 insertions(+), 151 deletions(-)
--
1.9.1
next reply other threads:[~2015-07-06 17:16 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-06 17:16 Evgen Druzhynin [this message]
2015-07-06 17:16 ` [PATCH] Added ability to scip patch hunk with an empty filename Evgen Druzhynin
2015-07-06 18:36 ` 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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1436202974-7624-1-git-send-email-evgen.druzhynin@gmail.com \
--to=evgen.druzhynin@gmail.com \
--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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).