File git-apply-Allow-creating-files-with-git-patches... of Package git

Overview Repositories Revisions Requests Users Attributes Meta

File git-apply-Allow-creating-files-with-git-patches.patch of Package git

From 7a1115caaf8e35e81ebb943de0fb14c6fc65ad8b Mon Sep 17 00:00:00 2001
From: Michal Suchanek <msuchanek@suse.de>
Date: Tue, 25 Oct 2022 22:37:42 +0200
Subject: [PATCH] apply: Be more explicit about filename inconsistency

before:

error: git apply: bad git-diff - inconsistent new filename on line 80

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

diff --git a/apply.c b/apply.c
index 2b7cd930ef..a5e6b44fb7 100644
--- a/apply.c
+++ b/apply.c
@@ -931,8 +931,9 @@ static int gitdiff_verify_name(struct gitdiff_data *state,
 		if (!another || strcmp(another, *name)) {
 			free(another);
 			return error((side == DIFF_NEW_NAME) ?
-			    _("git apply: bad git-diff - inconsistent new filename on line %d") :
-			    _("git apply: bad git-diff - inconsistent old filename on line %d"), state->linenr);
+			    _("git apply: bad git-diff - inconsistent new filename %s on line %d, expected %s") :
+			    _("git apply: bad git-diff - inconsistent old filename %s on line %d, expected %s"),
+                            *name, state->linenr, another);
 		}
 		free(another);
 	} else {
-- 
2.38.0

Places

File git-apply-Allow-creating-files-with-git-patches.patch of Package git

Places