You can use filterdiff to obtain a patch that applies to files matching the shell wildcard
PATTERN
from a larger collection of patches. For example, to see the patches in
patch-2.4.3.gz
that apply to all files called
lp.c:
filterdiff -z -i '*/lp.c' patch-2.4.3.gz
If neither
-i
nor
-x
options are given,
-i '*'
is assumed. This way
filterdiff
can be used to clean up an existing diff file, removing redundant lines from the beginning (eg. the text from the mail body) or between the chunks (eg. in CVS diffs). To extract pure patch data, use a command like this:
filterdiff message-with-diff-in-the-body > patch
Note that the interpretation of the shell wildcard pattern does not count slash characters or periods as special (in other words, no flags are given to
fnmatch). This is so that
lq*/basenamerq-type patterns can be given without limiting the number of pathname components.
You can use both unified and context format diffs with this program.
OPTIONS
-iPATTERN
Include only files matching
PATTERN. All other lines in the input are suppressed.
-xPATTERN
Exclude files matching
PATTERN. All other lines in the input are displayed.
-pn
When matching, ignore the first
n
components of the pathname.
-#RANGE | --hunks=RANGE
Only include hunks within the specified
RANGE. Hunks are numbered from 1, and the range is a comma-separated list of numbers or
lqfirst-lastrq
spans; either the first or the last in the span may be omitted to indicate no limit in that direction.
--lines=RANGE
Only include hunks that contain lines from the original file that lie within the specified
RANGE. Lines are numbered from 1, and the range is a comma-separated list of numbers or
lqfirst-lastrq
spans; either the first or the last in the span may be omitted to indicate no limit in that direction.
--files=RANGE
Only include files indicated by the specified
RANGE. Files are numbered from 1 in the order they appear in the patch input, and the range is a comma-separated list of numbers or
lqfirst-lastrq
spans; either the first or the last in the span may be omitted to indicate no limit in that direction.
--annotate
Annotate each hunk with the filename and hunk number.
--format=unified|context
Use specified output format.
--strip=n
Remove the first
n
components of pathnames in the output.
--addprefix=PREFIX
Prefix pathnames in the output by
PREFIX.
--as-numbered-lines=before|after
Instead of a patch fragment, display the lines of the selected hunks with the line number of the file before (or after) the patch is applied, followed by a
TAB
character and a colon, at the beginning of each line. Each hunk except the first will have a line consisting of
lq...rq
before it.
--remove-timestamps
Do not include file timestamps in the output.
-v, --verbose
Always show non-diff lines in the output. By default, non-diff lines are only shown when excluding a filename pattern.