Description of problem: filterdiff breaks delete chunk headers of git diff output Version-Release number of selected component (if applicable): patchutils-0.3.4-1.fc22 How reproducible: input should be some patch including hunks deleting whole files, e.g.: diff --git a/drivers/gpu/drm/i915/intel_dp_i2c.c b/drivers/gpu/drm/i915/intel_dp_i2c.c deleted file mode 100644 index a63b6f5..0000000 --- a/drivers/gpu/drm/i915/intel_dp_i2c.c +++ /dev/null Steps to Reproduce: /usr/bin/filterdiff '-x */foo' patch_with_delete_hunks.patch Actual results: broken deleting chunk header - line with name of the deleted file is missing and patch utility then cannot handle this. diff --git a/drivers/gpu/drm/i915/intel_dp_i2c.c b/drivers/gpu/drm/i915/intel_dp_i2c.c deleted file mode 100644 index a63b6f5..0000000 +++ /dev/null Expected results: header should remain the same: diff --git a/drivers/gpu/drm/i915/intel_dp_i2c.c b/drivers/gpu/drm/i915/intel_dp_i2c.c deleted file mode 100644 index a63b6f5..0000000 --- a/drivers/gpu/drm/i915/intel_dp_i2c.c +++ /dev/null Additional info: patchutils-0.3.3-6.fc21 on F21 worked well, I've encoutered problem above after update to F22
Thanks for the bug report. Fixed upstream: https://github.com/twaugh/patchutils/commit/3b7703f
patchutils-0.3.4-2.fc22 has been submitted as an update for Fedora 22. https://admin.fedoraproject.org/updates/patchutils-0.3.4-2.fc22
patchutils-0.3.4-2.fc21 has been submitted as an update for Fedora 21. https://admin.fedoraproject.org/updates/FEDORA-2015-6677/patchutils-0.3.4-2.fc21
Package patchutils-0.3.4-2.fc22: * should fix your issue, * was pushed to the Fedora 22 testing repository, * should be available at your local mirror within two days. Update it with: # su -c 'yum update --enablerepo=updates-testing patchutils-0.3.4-2.fc22' as soon as you are able to. Please go to the following url: https://admin.fedoraproject.org/updates/FEDORA-2015-9724/patchutils-0.3.4-2.fc22 then log in and leave karma (feedback).
patchutils-0.3.4-2.fc22 has been pushed to the Fedora 22 stable repository. If problems still persist, please make note of it in this bug report.
patchutils-0.3.4-2.fc21 has been pushed to the Fedora 21 stable repository. If problems still persist, please make note of it in this bug report.