1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
|
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<style type="text/css">
@import url('css/main.css');
</style>
<title>
Libreboot documentation: using diff and patch
</title>
</head>
<body>
<header>
<h1 id="pagetop">Diff and patch</h1>
<aside>This is just a quick guide for reference, use 'man' to know more.</aside>
</header>
<p>
<a href="index.html">back to index</a>
</p>
<hr/>
<h1>
Apply a patch
</h1>
<p class="important">
To apply a patch to a single file, do that in it's directory:<br/>
<b>$ patch < foo.patch</b>
</p>
<p>
Assuming that the patch is distributed in unified format identifying
the file the patch should be applied to, the above will work. Otherwise:<br/>
<b>$ patch foo.txt < bar.patch</b>
</p>
<p>
You can apply a patch to an entire directory, but note the "p level".
What this means is that inside patch files will be the files that you
intend to patch, identified by path names that might be different
when the files ane located on your own computer instead of on the computer
where the patch was created. 'p' level instructs the 'patch' utility to
ignore parts of the path name to identify the files correctly. Usually a
p level of 1 will work, so you would use:<br/>
<b>$ patch -p1 < baz.patch</b>
</p>
<p>
Change to the top level directory before running this. If a patch level
of 1 cannot identify the files to patch, then inspect the patch file for file names.
For example:<br/>
<b>/home/user/do/not/panic/yet.c</b>
</p>
<p>
and you are working in a directory that contains panic/yet.c, use:<br/>
<b>$ patch -p5 < baz.patch</b>
</p>
<p>
You usually count one up for each path separator (forward slash)
removed from the beginning of the path, until you are left with a path
that exists in the current working directory. The count is the p level.
</p>
<p>
Removing a patch using the -R flag<br/>
<b>$ patch -p5 -R < baz.patch</b>
</p>
<p><a href="#pagetop">Back to top of page.</a></p>
<hr/>
<h1>
Create a patch with diff
</h1>
<p>
Diff can create a patch for a single file:<br/>
<b>$ diff -u original.c new.c > original.patch</b>
</p>
<p>
For diff'ing a source tree:<br/>
<b>$ cp -R original new</b>
</p>
<p>
Do whatever you want in new/ and then diff it:<br/>
<b>$ diff -rupN original/ new/ > original.patch</b>
</p>
<p><a href="#pagetop">Back to top of page.</a></p>
<hr/>
<h1>
git diff
</h1>
<p>
git is something special.
</p>
<p>
Just make whatever changes you want to a git clone and then:<br/>
<b>$ git diff > patch.git</b>
</p>
<p>
Note the git revision that you did this with:<br/>
<b>$ git log</b>
</p>
<p><a href="#pagetop">Back to top of page.</a></p>
<hr/>
<h1>
git apply
</h1>
<p>it really is.</p>
<p>
Now to apply that patch in the future, just git clone it again and do
with the git revision you found from above:<br/>
<b>$ git reset --hard REVISIONNUMBER</b>
</p>
<p>
Now put patch.git in the git clone directory and do:<br/>
<b>$ git apply patch.git</b>
</p>
<p><a href="#pagetop">Back to top of page.</a></p>
<hr/>
<p>
Copyright © 2014 Francis Rowe <info@gluglug.org.uk><br/>
This document is released under the Creative Commons Attribution-ShareAlike 4.0 International Public License and all future versions.
A copy of the license can be found at <a href="../license.txt">../license.txt</a>.
</p>
<p>
This document is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See <a href="../license.txt">../license.txt</a> for more information.
</p>
</body>
</html>
|
