search

openzfs / zfs

OpenZFS on Linux and FreeBSD
https://openzfs.github.io/openzfs-docs
Other
10.43k stars 1.73k forks source link

backport fgrep to 2.1.7 #14071

Open ptr1337 opened 1 year ago

ptr1337 commented 1 year ago

Actually I have noticed that fgrep is still used in the 2.1.6 release. I think backporting the commit would be a good idea:

https://github.com/openzfs/zfs/commit/d30577c9dd811688f2609ad532b011b99bceb485

szubersk commented 1 year ago

@ptr1337, deliveries to master are cherry-picked to the 2.1.7 release by creating a PR with the desired change for the openzfs/zfs:zfs-2.1.7-staging branch. Feel free to create fgrep one.

nabijaczleweli commented 1 year ago

d30577c9dd811688f2609ad532b011b99bceb485 (fgrep) is trivial (i.e. it cherry-picked clean for me), f63c9dc70a40f930b09b586e6bc53cabf90fa3a1 (egrep) less so (i.e. there's 20 files of conflicts); this is entirely a stylistic/vaguely-conformance-i-guess-but-you're-really-stretching-it difference, so I don't really see the effort in being worth the result out.