diff --git a/reject-print-function-01-drop-useless-test.patch b/reject-print-function-01-drop-useless-test.patch index 8869a54..4b87881 100644 --- a/reject-print-function-01-drop-useless-test.patch +++ b/reject-print-function-01-drop-useless-test.patch @@ -1,6 +1,6 @@ From: Jean Delvare Subject: Drop useless test in another_hunk() -Upstream: Submitted (2014-11-10) +Upstream: Committed (65193f1cc1bf38bdd63d1f3087b0d7e16ad3f082) This test will always succeed so it is either broken or useless. The equivalent code path for context patches doesn't have this test so I diff --git a/reject-print-function-02-handle-unified-format.patch b/reject-print-function-02-handle-unified-format.patch index 2ab4a7d..97a91f0 100644 --- a/reject-print-function-02-handle-unified-format.patch +++ b/reject-print-function-02-handle-unified-format.patch @@ -1,15 +1,14 @@ -From: Jean Delvare -Subject: Preserve C function name in unified rejects -Upstream: Submitted (2014-11-10) +From: Steven Rostedt +Subject: Preserve function names in reject files +Upstream: Committed (a2f4bfe0f3f54181a8f1077cde9ebef0b4f891c0) References: bnc#904519 -We already support that in context rejects, just do the same for -unified rejects. +* src/patch.c (main): Preserve function names in reject files. +* tests/reject-format: Update the test case. --- - src/patch.c | 3 ++- - tests/preserve-c-function-names | 16 ++++++++++++++++ - tests/reject-format | 4 ++-- - 3 files changed, 20 insertions(+), 3 deletions(-) + src/patch.c | 3 ++- + tests/reject-format | 4 ++-- + 2 files changed, 4 insertions(+), 3 deletions(-) --- a/src/patch.c +++ b/src/patch.c @@ -30,35 +29,6 @@ unified rejects. while (pch_char (new) == '=' || pch_char (new) == '\n') new++; ---- a/tests/preserve-c-function-names -+++ b/tests/preserve-c-function-names -@@ -34,6 +34,7 @@ EOF - preserve_trailing_blank= - - diff -p -c -L a -L b a b > ab.diff -+diff -p -u -L a -L b a b > ab-unified.diff - touch c - check 'patch c < ab.diff || cat c.rej' <