src/usr.bin/patch/tests, branch release/13.4.0FreeBSD source treehttps://cgit-dev.freebsd.org/src/atom?h=release%2F13.4.02023-08-23T17:43:30ZRemove $FreeBSD$: one-line sh pattern2023-08-23T17:43:30ZWarner Loshimp@FreeBSD.org2023-08-22T01:32:01Zurn:sha1:023fc80ee38a117fa65b2ccb2abf8bdc7dbd6fd9
Remove /^\s*#[#!]?\s*\$FreeBSD\$.*$\n/
Similar commit in main:
(cherry picked from commit d0b2dbfa0ecf)
spdx: The BSD-2-Clause-FreeBSD identifier is obsolete, drop -FreeBSD2023-07-25T15:13:49ZWarner Loshimp@FreeBSD.org2023-05-10T15:40:58Zurn:sha1:caa41f641755c935b036e17440a3b49329c904ed
The SPDX folks have obsoleted the BSD-2-Clause-FreeBSD identifier. Catch
up to that fact and revert to their recommended match of BSD-2-Clause.
Discussed with: pfg
MFC After: 3 days
Sponsored by: Netflix
(cherry picked from commit 4d846d260e2b9a3d4d0a701462568268cbfe7a5b)
patch(1): give /dev/null patches special treatment2019-11-04T03:07:01ZKyle Evanskevans@FreeBSD.org2019-11-04T03:07:01Zurn:sha1:50dacbf6c2a3d32f7e3f20ca98cda23f38817e7f
We have a bad habit of duplicating contents of files that are sourced from
/dev/null and applied more than once... take the more sane (in most ways)
GNU route and complain if the file exists and offer reversal options.
This still falls short a little bit as selecting "don't reverse, apply
anyway" will still give you duplicated file contents. There's probably other
issues as well, but awareness is the first step to happiness.
MFC after: 2 weeks
Differential Revision: https://reviews.freebsd.org/D21535
patch(1): fix the file removal test, strengthen it a bit2019-09-05T15:35:57ZKyle Evanskevans@FreeBSD.org2019-09-05T15:35:57Zurn:sha1:89b5571e0b4083de499f2b835460349a7c3ebc2c
To remain compatible with GNU patch, we should ensure that once we're
removing empty files after a reversed /dev/null patch we don't remove files
that have been modified. GNU patch leaves these intact and just reverses the
hunk that created the file, effectively implying --remove-empty-files for
reversed /dev/null patches.
patch(1): add some basic tests2019-09-05T03:16:14ZKyle Evanskevans@FreeBSD.org2019-09-05T03:16:14Zurn:sha1:b27524973cda910697949980e95ad62e5e4be3d1
Summary:
- basic: test application of patches created by diff -u at the
beginning/middle/end of file, which have differing amounts of context
before and after chunks being added
- limited_ctx: stems from PR 74127 in which a rogue line was getting added
when the patch should have been rejected. Similar behavior was
reproducible with larger contexts near the beginning/end of a file. See
r326084 for details
- file_creation: patch sourced from /dev/null should create the file
- file_nodupe: said patch sourced from /dev/null shouldn't dupe the contents
when re-applied (personal vendetta, WIP, see comment)
- file_removal: this follows from nodupe; the reverse of a patch sourced
from /dev/null is most naturally deleting the file, as is expected based
on GNU patch behavior (WIP)