git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Michal Suchanek <msuchanek@suse.de>
To: git@vger.kernel.org
Cc: Michal Suchanek <msuchanek@suse.de>
Subject: [PATCH] apply: Allow creating files with git patches
Date: Wed, 26 Oct 2022 10:32:04 +0200	[thread overview]
Message-ID: <20221026083204.21333-1-msuchanek@suse.de> (raw)

In git 2.38.0 it is not possible to create a file with apply when the diff
looks like git diff.

It either complains that the source file is not /dev/null or that it is
not the same as the destination.

something.patch
No author found in something.patch
---
Sometext

Author: A. U. Thor <au@thor.com>
gitdiff_verify_name: line: b/somefile.c
@@ -0,0 +1,379 @@
+/*
...
, isnull: 0, *name: somefile.c, side: 1, another: (null)
error: git apply: bad git-diff - inconsistent new filename on line 80

something.patch
No author found in something.patch
---
Sometext

Author: A. U. Thor <au@thor.com>
gitdiff_verify_name: line: a/somefile.c
+++ b/somefile.c
@@ -0,0 +1,379 @@
+/*
...
, isnull: 1, *name: (null), side: 0
error: git apply: bad git-diff - expected /dev/null on line 80

Signed-off-by: Michal Suchanek <msuchanek@suse.de>
---
 apply.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apply.c b/apply.c
index 2b7cd930ef..9dd01da271 100644
--- a/apply.c
+++ b/apply.c
@@ -928,7 +928,7 @@ static int gitdiff_verify_name(struct gitdiff_data *state,
 			return error(_("git apply: bad git-diff - expected /dev/null, got %s on line %d"),
 				     *name, state->linenr);
 		another = find_name(state->root, line, NULL, state->p_value, TERM_TAB);
-		if (!another || strcmp(another, *name)) {
+		if (another && strcmp(another, *name)) {
 			free(another);
 			return error((side == DIFF_NEW_NAME) ?
 			    _("git apply: bad git-diff - inconsistent new filename on line %d") :
-- 
2.38.0


             reply	other threads:[~2022-10-26  8:32 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-10-26  8:32 Michal Suchanek [this message]
2022-10-26  8:57 ` [PATCH] apply: Allow creating files with git patches Michal Suchánek

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=20221026083204.21333-1-msuchanek@suse.de \
    --to=msuchanek@suse.de \
    --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).