diff options
| author | Andreas Gruenbacher <agruen@linbit.com> | 2014-08-13 01:13:37 +0200 |
|---|---|---|
| committer | Andreas Gruenbacher <agruen@linbit.com> | 2014-08-13 01:16:44 +0200 |
| commit | f926295f4fdfb2777bbd4bfa51441fd5a4f0a9b0 (patch) | |
| tree | 6c035e98213fef3f2c45bf50b9a7937eadbc701e | |
| parent | dc63883f08f6ff4f87e1192819a145450a66629c (diff) | |
| download | patch-f926295f4fdfb2777bbd4bfa51441fd5a4f0a9b0.tar.gz | |
Improve error message when refusing to delete file
* src/patch.c: Improve error message.
* tests/create-delete: Update the test case.
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | src/patch.c | 2 | ||||
| -rw-r--r-- | tests/create-delete | 6 |
3 files changed, 8 insertions, 4 deletions
@@ -1,3 +1,7 @@ +* When a file isn't being deleted because the file contents don't match the + patch, the resulting message is now "Not deleting file ... as content + differs from patch" instead of "File ... is not empty after patch; not + deleting". * Function names in hunks (from diff -p) are now preserved in reject files. Changes in version 2.7.1: diff --git a/src/patch.c b/src/patch.c index 0ecfa6c..12028a9 100644 --- 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)); } diff --git a/tests/create-delete b/tests/create-delete index 88ff9bc..404d99e 100644 --- a/tests/create-delete +++ b/tests/create-delete @@ -182,7 +182,7 @@ EOF check 'patch -p0 < p.diff || echo status: $?' <<EOF patching file target -File target is not empty after patch; not deleting +Not deleting file target as content differs from patch status: 1 EOF @@ -202,7 +202,7 @@ EOF check 'patch -p0 < p.diff || echo status: $?' <<EOF patching file target -File target is not empty after patch; not deleting +Not deleting file target as content differs from patch status: 1 EOF @@ -224,7 +224,7 @@ EOF check 'patch -p1 -b < p.diff || echo status: $?' <<EOF patching file target -File target is not empty after patch; not deleting +Not deleting file target as content differs from patch status: 1 EOF |