[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [bug-patch] Incorrect error when applying git-created patch

From: Andreas Grünbacher
Subject: Re: [bug-patch] Incorrect error when applying git-created patch
Date: Wed, 13 Aug 2014 16:08:03 +0200

2014-08-12 10:42 GMT+02:00 Tim Waugh <address@hidden>:
> Maybe 'Binary files ... differ' could be spotted,

That's not completely trivial to get right in all cases; GNU patch
only prints that line and no patch headers, so we would need to
extract the file names as well, and make sure to get patch
boundaries right.

Is the following an improvement?

--- a/src/patch.c
+++ b/src/patch.c
@@ -519,7 +519,7 @@ main (int argc, char **argv)
                  mismatch = true;
                  somefailed = true;
                  if (verbosity != SILENT)
-                   say ("File %s is not empty after patch; not deleting\n",
+                   say ("Not deleting file %s as content differs from patch\n",
                         quotearg (outname));


reply via email to

[Prev in Thread] Current Thread [Next in Thread]