]>
Commit | Line | Data |
---|---|---|
88e7fdf2 JH |
1 | gitattributes(5) |
2 | ================ | |
3 | ||
4 | NAME | |
5 | ---- | |
1b81d8cb | 6 | gitattributes - Defining attributes per path |
88e7fdf2 JH |
7 | |
8 | SYNOPSIS | |
9 | -------- | |
e5b5c1d2 | 10 | $GIT_DIR/info/attributes, .gitattributes |
88e7fdf2 JH |
11 | |
12 | ||
13 | DESCRIPTION | |
14 | ----------- | |
15 | ||
16 | A `gitattributes` file is a simple text file that gives | |
17 | `attributes` to pathnames. | |
18 | ||
19 | Each line in `gitattributes` file is of form: | |
20 | ||
8d75a1d1 | 21 | pattern attr1 attr2 ... |
88e7fdf2 | 22 | |
3f74c8e8 | 23 | That is, a pattern followed by an attributes list, |
860a74d9 NTND |
24 | separated by whitespaces. Leading and trailing whitespaces are |
25 | ignored. Lines that begin with '#' are ignored. Patterns | |
26 | that begin with a double quote are quoted in C style. | |
27 | When the pattern matches the path in question, the attributes | |
28 | listed on the line are given to the path. | |
88e7fdf2 JH |
29 | |
30 | Each attribute can be in one of these states for a given path: | |
31 | ||
32 | Set:: | |
33 | ||
34 | The path has the attribute with special value "true"; | |
35 | this is specified by listing only the name of the | |
36 | attribute in the attribute list. | |
37 | ||
38 | Unset:: | |
39 | ||
40 | The path has the attribute with special value "false"; | |
41 | this is specified by listing the name of the attribute | |
42 | prefixed with a dash `-` in the attribute list. | |
43 | ||
44 | Set to a value:: | |
45 | ||
46 | The path has the attribute with specified string value; | |
47 | this is specified by listing the name of the attribute | |
48 | followed by an equal sign `=` and its value in the | |
49 | attribute list. | |
50 | ||
51 | Unspecified:: | |
52 | ||
3f74c8e8 | 53 | No pattern matches the path, and nothing says if |
b9d14ffb JH |
54 | the path has or does not have the attribute, the |
55 | attribute for the path is said to be Unspecified. | |
88e7fdf2 | 56 | |
3f74c8e8 | 57 | When more than one pattern matches the path, a later line |
b9d14ffb | 58 | overrides an earlier line. This overriding is done per |
b635ed97 JK |
59 | attribute. |
60 | ||
61 | The rules by which the pattern matches paths are the same as in | |
62 | `.gitignore` files (see linkgit:gitignore[5]), with a few exceptions: | |
63 | ||
64 | - negative patterns are forbidden | |
65 | ||
66 | - patterns that match a directory do not recursively match paths | |
67 | inside that directory (so using the trailing-slash `path/` syntax is | |
68 | pointless in an attributes file; use `path/**` instead) | |
88e7fdf2 | 69 | |
2de9b711 | 70 | When deciding what attributes are assigned to a path, Git |
88e7fdf2 JH |
71 | consults `$GIT_DIR/info/attributes` file (which has the highest |
72 | precedence), `.gitattributes` file in the same directory as the | |
20ff3ec2 JM |
73 | path in question, and its parent directories up to the toplevel of the |
74 | work tree (the further the directory that contains `.gitattributes` | |
6df42ab9 PO |
75 | is from the path in question, the lower its precedence). Finally |
76 | global and system-wide files are considered (they have the lowest | |
77 | precedence). | |
88e7fdf2 | 78 | |
40701adb NTND |
79 | When the `.gitattributes` file is missing from the work tree, the |
80 | path in the index is used as a fall-back. During checkout process, | |
81 | `.gitattributes` in the index is used and then the file in the | |
82 | working tree is used as a fall-back. | |
83 | ||
90b22907 | 84 | If you wish to affect only a single repository (i.e., to assign |
6df42ab9 PO |
85 | attributes to files that are particular to |
86 | one user's workflow for that repository), then | |
90b22907 JK |
87 | attributes should be placed in the `$GIT_DIR/info/attributes` file. |
88 | Attributes which should be version-controlled and distributed to other | |
89 | repositories (i.e., attributes of interest to all users) should go into | |
6df42ab9 PO |
90 | `.gitattributes` files. Attributes that should affect all repositories |
91 | for a single user should be placed in a file specified by the | |
da0005b8 | 92 | `core.attributesFile` configuration option (see linkgit:git-config[1]). |
684e40f6 HKNN |
93 | Its default value is $XDG_CONFIG_HOME/git/attributes. If $XDG_CONFIG_HOME |
94 | is either not set or empty, $HOME/.config/git/attributes is used instead. | |
6df42ab9 PO |
95 | Attributes for all users on a system should be placed in the |
96 | `$(prefix)/etc/gitattributes` file. | |
90b22907 | 97 | |
faa4e8ce | 98 | Sometimes you would need to override a setting of an attribute |
0922570c | 99 | for a path to `Unspecified` state. This can be done by listing |
88e7fdf2 JH |
100 | the name of the attribute prefixed with an exclamation point `!`. |
101 | ||
102 | ||
103 | EFFECTS | |
104 | ------- | |
105 | ||
2de9b711 | 106 | Certain operations by Git can be influenced by assigning |
ae7aa499 JH |
107 | particular attributes to a path. Currently, the following |
108 | operations are attributes-aware. | |
88e7fdf2 JH |
109 | |
110 | Checking-out and checking-in | |
111 | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | |
112 | ||
3fed15f5 | 113 | These attributes affect how the contents stored in the |
88e7fdf2 | 114 | repository are copied to the working tree files when commands |
d787d311 NTND |
115 | such as 'git switch', 'git checkout' and 'git merge' run. |
116 | They also affect how | |
2de9b711 | 117 | Git stores the contents you prepare in the working tree in the |
0b444cdb | 118 | repository upon 'git add' and 'git commit'. |
88e7fdf2 | 119 | |
5ec3e670 | 120 | `text` |
3fed15f5 JH |
121 | ^^^^^^ |
122 | ||
fd6cce9e EB |
123 | This attribute enables and controls end-of-line normalization. When a |
124 | text file is normalized, its line endings are converted to LF in the | |
125 | repository. To control what line ending style is used in the working | |
126 | directory, use the `eol` attribute for a single file and the | |
942e7747 | 127 | `core.eol` configuration variable for all text files. |
2b680853 JK |
128 | Note that setting `core.autocrlf` to `true` or `input` overrides |
129 | `core.eol` (see the definitions of those options in | |
130 | linkgit:git-config[1]). | |
3fed15f5 | 131 | |
88e7fdf2 JH |
132 | Set:: |
133 | ||
5ec3e670 | 134 | Setting the `text` attribute on a path enables end-of-line |
fd6cce9e EB |
135 | normalization and marks the path as a text file. End-of-line |
136 | conversion takes place without guessing the content type. | |
88e7fdf2 JH |
137 | |
138 | Unset:: | |
139 | ||
2de9b711 | 140 | Unsetting the `text` attribute on a path tells Git not to |
bbb896d8 | 141 | attempt any end-of-line conversion upon checkin or checkout. |
88e7fdf2 | 142 | |
fd6cce9e | 143 | Set to string value "auto":: |
88e7fdf2 | 144 | |
5ec3e670 | 145 | When `text` is set to "auto", the path is marked for automatic |
65237284 TB |
146 | end-of-line conversion. If Git decides that the content is |
147 | text, its line endings are converted to LF on checkin. | |
2e3a16b2 | 148 | When the file has been committed with CRLF, no conversion is done. |
88e7fdf2 | 149 | |
88e7fdf2 JH |
150 | Unspecified:: |
151 | ||
2de9b711 | 152 | If the `text` attribute is unspecified, Git uses the |
942e7747 EB |
153 | `core.autocrlf` configuration variable to determine if the |
154 | file should be converted. | |
88e7fdf2 | 155 | |
2de9b711 | 156 | Any other value causes Git to act as if `text` has been left |
fd6cce9e | 157 | unspecified. |
88e7fdf2 | 158 | |
fd6cce9e EB |
159 | `eol` |
160 | ^^^^^ | |
88e7fdf2 | 161 | |
fd6cce9e | 162 | This attribute sets a specific line-ending style to be used in the |
8c591dbf | 163 | working directory. This attribute has effect only if the `text` |
164 | attribute is set or unspecified, or if it is set to `auto` and the file | |
165 | is detected as text. Note that setting this attribute on paths which | |
166 | are in the index with CRLF line endings may make the paths to be | |
167 | considered dirty. Adding the path to the index again will normalize the | |
168 | line endings in the index. | |
88e7fdf2 | 169 | |
fd6cce9e | 170 | Set to string value "crlf":: |
88e7fdf2 | 171 | |
2de9b711 | 172 | This setting forces Git to normalize line endings for this |
942e7747 EB |
173 | file on checkin and convert them to CRLF when the file is |
174 | checked out. | |
fd6cce9e EB |
175 | |
176 | Set to string value "lf":: | |
177 | ||
2de9b711 | 178 | This setting forces Git to normalize line endings to LF on |
fd6cce9e | 179 | checkin and prevents conversion to CRLF when the file is |
942e7747 | 180 | checked out. |
5ec3e670 EB |
181 | |
182 | Backwards compatibility with `crlf` attribute | |
183 | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | |
184 | ||
185 | For backwards compatibility, the `crlf` attribute is interpreted as | |
186 | follows: | |
187 | ||
188 | ------------------------ | |
189 | crlf text | |
190 | -crlf -text | |
191 | crlf=input eol=lf | |
192 | ------------------------ | |
fd6cce9e EB |
193 | |
194 | End-of-line conversion | |
195 | ^^^^^^^^^^^^^^^^^^^^^^ | |
196 | ||
2de9b711 | 197 | While Git normally leaves file contents alone, it can be configured to |
fd6cce9e EB |
198 | normalize line endings to LF in the repository and, optionally, to |
199 | convert them to CRLF when files are checked out. | |
200 | ||
fd6cce9e EB |
201 | If you simply want to have CRLF line endings in your working directory |
202 | regardless of the repository you are working with, you can set the | |
65237284 | 203 | config variable "core.autocrlf" without using any attributes. |
fd6cce9e EB |
204 | |
205 | ------------------------ | |
206 | [core] | |
207 | autocrlf = true | |
208 | ------------------------ | |
209 | ||
e28eae31 | 210 | This does not force normalization of text files, but does ensure |
fd6cce9e EB |
211 | that text files that you introduce to the repository have their line |
212 | endings normalized to LF when they are added, and that files that are | |
942e7747 | 213 | already normalized in the repository stay normalized. |
fd6cce9e | 214 | |
e28eae31 TB |
215 | If you want to ensure that text files that any contributor introduces to |
216 | the repository have their line endings normalized, you can set the | |
217 | `text` attribute to "auto" for _all_ files. | |
88e7fdf2 | 218 | |
fd6cce9e | 219 | ------------------------ |
5ec3e670 | 220 | * text=auto |
fd6cce9e EB |
221 | ------------------------ |
222 | ||
e28eae31 TB |
223 | The attributes allow a fine-grained control, how the line endings |
224 | are converted. | |
225 | Here is an example that will make Git normalize .txt, .vcproj and .sh | |
226 | files, ensure that .vcproj files have CRLF and .sh files have LF in | |
227 | the working directory, and prevent .jpg files from being normalized | |
228 | regardless of their content. | |
229 | ||
230 | ------------------------ | |
231 | * text=auto | |
232 | *.txt text | |
233 | *.vcproj text eol=crlf | |
234 | *.sh text eol=lf | |
235 | *.jpg -text | |
236 | ------------------------ | |
237 | ||
238 | NOTE: When `text=auto` conversion is enabled in a cross-platform | |
239 | project using push and pull to a central repository the text files | |
240 | containing CRLFs should be normalized. | |
fd6cce9e | 241 | |
e28eae31 | 242 | From a clean working directory: |
fd6cce9e EB |
243 | |
244 | ------------------------------------------------- | |
e28eae31 | 245 | $ echo "* text=auto" >.gitattributes |
9472935d | 246 | $ git add --renormalize . |
fd6cce9e | 247 | $ git status # Show files that will be normalized |
fd6cce9e EB |
248 | $ git commit -m "Introduce end-of-line normalization" |
249 | ------------------------------------------------- | |
250 | ||
251 | If any files that should not be normalized show up in 'git status', | |
5ec3e670 | 252 | unset their `text` attribute before running 'git add -u'. |
fd6cce9e EB |
253 | |
254 | ------------------------ | |
5ec3e670 | 255 | manual.pdf -text |
fd6cce9e | 256 | ------------------------ |
88e7fdf2 | 257 | |
2de9b711 | 258 | Conversely, text files that Git does not detect can have normalization |
fd6cce9e | 259 | enabled manually. |
88e7fdf2 | 260 | |
fd6cce9e | 261 | ------------------------ |
5ec3e670 | 262 | weirdchars.txt text |
fd6cce9e | 263 | ------------------------ |
88e7fdf2 | 264 | |
2de9b711 | 265 | If `core.safecrlf` is set to "true" or "warn", Git verifies if |
21e5ad50 | 266 | the conversion is reversible for the current setting of |
2de9b711 TA |
267 | `core.autocrlf`. For "true", Git rejects irreversible |
268 | conversions; for "warn", Git only prints a warning but accepts | |
21e5ad50 SP |
269 | an irreversible conversion. The safety triggers to prevent such |
270 | a conversion done to the files in the work tree, but there are a | |
271 | few exceptions. Even though... | |
272 | ||
0b444cdb | 273 | - 'git add' itself does not touch the files in the work tree, the |
21e5ad50 SP |
274 | next checkout would, so the safety triggers; |
275 | ||
0b444cdb | 276 | - 'git apply' to update a text file with a patch does touch the files |
21e5ad50 SP |
277 | in the work tree, but the operation is about text files and CRLF |
278 | conversion is about fixing the line ending inconsistencies, so the | |
279 | safety does not trigger; | |
280 | ||
0b444cdb TR |
281 | - 'git diff' itself does not touch the files in the work tree, it is |
282 | often run to inspect the changes you intend to next 'git add'. To | |
21e5ad50 SP |
283 | catch potential problems early, safety triggers. |
284 | ||
88e7fdf2 | 285 | |
107642fe LS |
286 | `working-tree-encoding` |
287 | ^^^^^^^^^^^^^^^^^^^^^^^ | |
288 | ||
289 | Git recognizes files encoded in ASCII or one of its supersets (e.g. | |
290 | UTF-8, ISO-8859-1, ...) as text files. Files encoded in certain other | |
291 | encodings (e.g. UTF-16) are interpreted as binary and consequently | |
292 | built-in Git text processing tools (e.g. 'git diff') as well as most Git | |
293 | web front ends do not visualize the contents of these files by default. | |
294 | ||
295 | In these cases you can tell Git the encoding of a file in the working | |
296 | directory with the `working-tree-encoding` attribute. If a file with this | |
031fd4b9 | 297 | attribute is added to Git, then Git re-encodes the content from the |
107642fe LS |
298 | specified encoding to UTF-8. Finally, Git stores the UTF-8 encoded |
299 | content in its internal data structure (called "the index"). On checkout | |
031fd4b9 | 300 | the content is re-encoded back to the specified encoding. |
107642fe LS |
301 | |
302 | Please note that using the `working-tree-encoding` attribute may have a | |
303 | number of pitfalls: | |
304 | ||
305 | - Alternative Git implementations (e.g. JGit or libgit2) and older Git | |
306 | versions (as of March 2018) do not support the `working-tree-encoding` | |
307 | attribute. If you decide to use the `working-tree-encoding` attribute | |
308 | in your repository, then it is strongly recommended to ensure that all | |
309 | clients working with the repository support it. | |
ad471949 AH |
310 | + |
311 | For example, Microsoft Visual Studio resources files (`*.rc`) or | |
312 | PowerShell script files (`*.ps1`) are sometimes encoded in UTF-16. | |
313 | If you declare `*.ps1` as files as UTF-16 and you add `foo.ps1` with | |
314 | a `working-tree-encoding` enabled Git client, then `foo.ps1` will be | |
315 | stored as UTF-8 internally. A client without `working-tree-encoding` | |
316 | support will checkout `foo.ps1` as UTF-8 encoded file. This will | |
317 | typically cause trouble for the users of this file. | |
318 | + | |
ed31851f AB |
319 | If a Git client that does not support the `working-tree-encoding` |
320 | attribute adds a new file `bar.ps1`, then `bar.ps1` will be | |
ad471949 AH |
321 | stored "as-is" internally (in this example probably as UTF-16). |
322 | A client with `working-tree-encoding` support will interpret the | |
323 | internal contents as UTF-8 and try to convert it to UTF-16 on checkout. | |
324 | That operation will fail and cause an error. | |
107642fe | 325 | |
e92d6225 LS |
326 | - Reencoding content to non-UTF encodings can cause errors as the |
327 | conversion might not be UTF-8 round trip safe. If you suspect your | |
328 | encoding to not be round trip safe, then add it to | |
329 | `core.checkRoundtripEncoding` to make Git check the round trip | |
330 | encoding (see linkgit:git-config[1]). SHIFT-JIS (Japanese character | |
331 | set) is known to have round trip issues with UTF-8 and is checked by | |
332 | default. | |
333 | ||
107642fe LS |
334 | - Reencoding content requires resources that might slow down certain |
335 | Git operations (e.g 'git checkout' or 'git add'). | |
336 | ||
337 | Use the `working-tree-encoding` attribute only if you cannot store a file | |
338 | in UTF-8 encoding and if you want Git to be able to process the content | |
339 | as text. | |
340 | ||
341 | As an example, use the following attributes if your '*.ps1' files are | |
342 | UTF-16 encoded with byte order mark (BOM) and you want Git to perform | |
343 | automatic line ending conversion based on your platform. | |
344 | ||
345 | ------------------------ | |
346 | *.ps1 text working-tree-encoding=UTF-16 | |
347 | ------------------------ | |
348 | ||
349 | Use the following attributes if your '*.ps1' files are UTF-16 little | |
350 | endian encoded without BOM and you want Git to use Windows line endings | |
e6e15194 | 351 | in the working directory (use `UTF-16LE-BOM` instead of `UTF-16LE` if |
aab2a1ae TB |
352 | you want UTF-16 little endian with BOM). |
353 | Please note, it is highly recommended to | |
107642fe LS |
354 | explicitly define the line endings with `eol` if the `working-tree-encoding` |
355 | attribute is used to avoid ambiguity. | |
356 | ||
357 | ------------------------ | |
358 | *.ps1 text working-tree-encoding=UTF-16LE eol=CRLF | |
359 | ------------------------ | |
360 | ||
361 | You can get a list of all available encodings on your platform with the | |
362 | following command: | |
363 | ||
364 | ------------------------ | |
365 | iconv --list | |
366 | ------------------------ | |
367 | ||
368 | If you do not know the encoding of a file, then you can use the `file` | |
369 | command to guess the encoding: | |
370 | ||
371 | ------------------------ | |
372 | file foo.ps1 | |
373 | ------------------------ | |
374 | ||
375 | ||
3fed15f5 JH |
376 | `ident` |
377 | ^^^^^^^ | |
378 | ||
2de9b711 | 379 | When the attribute `ident` is set for a path, Git replaces |
2c850f12 | 380 | `$Id$` in the blob object with `$Id:`, followed by the |
3fed15f5 JH |
381 | 40-character hexadecimal blob object name, followed by a dollar |
382 | sign `$` upon checkout. Any byte sequence that begins with | |
af9b54bb AP |
383 | `$Id:` and ends with `$` in the worktree file is replaced |
384 | with `$Id$` upon check-in. | |
3fed15f5 JH |
385 | |
386 | ||
aa4ed402 JH |
387 | `filter` |
388 | ^^^^^^^^ | |
389 | ||
c05ef938 | 390 | A `filter` attribute can be set to a string value that names a |
aa4ed402 JH |
391 | filter driver specified in the configuration. |
392 | ||
c05ef938 | 393 | A filter driver consists of a `clean` command and a `smudge` |
aa4ed402 | 394 | command, either of which can be left unspecified. Upon |
c05ef938 WC |
395 | checkout, when the `smudge` command is specified, the command is |
396 | fed the blob object from its standard input, and its standard | |
397 | output is used to update the worktree file. Similarly, the | |
398 | `clean` command is used to convert the contents of worktree file | |
edcc8581 LS |
399 | upon checkin. By default these commands process only a single |
400 | blob and terminate. If a long running `process` filter is used | |
401 | in place of `clean` and/or `smudge` filters, then Git can process | |
402 | all blobs with a single filter command invocation for the entire | |
403 | life of a single Git command, for example `git add --all`. If a | |
404 | long running `process` filter is configured then it always takes | |
405 | precedence over a configured single blob filter. See section | |
406 | below for the description of the protocol used to communicate with | |
407 | a `process` filter. | |
aa4ed402 | 408 | |
36daaaca JB |
409 | One use of the content filtering is to massage the content into a shape |
410 | that is more convenient for the platform, filesystem, and the user to use. | |
411 | For this mode of operation, the key phrase here is "more convenient" and | |
412 | not "turning something unusable into usable". In other words, the intent | |
413 | is that if someone unsets the filter driver definition, or does not have | |
414 | the appropriate filter program, the project should still be usable. | |
415 | ||
416 | Another use of the content filtering is to store the content that cannot | |
417 | be directly used in the repository (e.g. a UUID that refers to the true | |
2de9b711 | 418 | content stored outside Git, or an encrypted content) and turn it into a |
36daaaca JB |
419 | usable form upon checkout (e.g. download the external content, or decrypt |
420 | the encrypted content). | |
421 | ||
422 | These two filters behave differently, and by default, a filter is taken as | |
423 | the former, massaging the contents into more convenient shape. A missing | |
424 | filter driver definition in the config, or a filter driver that exits with | |
425 | a non-zero status, is not an error but makes the filter a no-op passthru. | |
426 | ||
427 | You can declare that a filter turns a content that by itself is unusable | |
428 | into a usable content by setting the filter.<driver>.required configuration | |
429 | variable to `true`. | |
aa4ed402 | 430 | |
9472935d TB |
431 | Note: Whenever the clean filter is changed, the repo should be renormalized: |
432 | $ git add --renormalize . | |
433 | ||
d79f5d17 NS |
434 | For example, in .gitattributes, you would assign the `filter` |
435 | attribute for paths. | |
436 | ||
437 | ------------------------ | |
438 | *.c filter=indent | |
439 | ------------------------ | |
440 | ||
441 | Then you would define a "filter.indent.clean" and "filter.indent.smudge" | |
442 | configuration in your .git/config to specify a pair of commands to | |
443 | modify the contents of C programs when the source files are checked | |
444 | in ("clean" is run) and checked out (no change is made because the | |
445 | command is "cat"). | |
446 | ||
447 | ------------------------ | |
448 | [filter "indent"] | |
449 | clean = indent | |
450 | smudge = cat | |
451 | ------------------------ | |
452 | ||
f217f0e8 EB |
453 | For best results, `clean` should not alter its output further if it is |
454 | run twice ("clean->clean" should be equivalent to "clean"), and | |
455 | multiple `smudge` commands should not alter `clean`'s output | |
456 | ("smudge->smudge->clean" should be equivalent to "clean"). See the | |
457 | section on merging below. | |
458 | ||
459 | The "indent" filter is well-behaved in this regard: it will not modify | |
460 | input that is already correctly indented. In this case, the lack of a | |
461 | smudge filter means that the clean filter _must_ accept its own output | |
462 | without modifying it. | |
463 | ||
36daaaca JB |
464 | If a filter _must_ succeed in order to make the stored contents usable, |
465 | you can declare that the filter is `required`, in the configuration: | |
466 | ||
467 | ------------------------ | |
468 | [filter "crypt"] | |
469 | clean = openssl enc ... | |
470 | smudge = openssl enc -d ... | |
471 | required | |
472 | ------------------------ | |
473 | ||
a2b665de PW |
474 | Sequence "%f" on the filter command line is replaced with the name of |
475 | the file the filter is working on. A filter might use this in keyword | |
476 | substitution. For example: | |
477 | ||
478 | ------------------------ | |
479 | [filter "p4"] | |
480 | clean = git-p4-filter --clean %f | |
481 | smudge = git-p4-filter --smudge %f | |
482 | ------------------------ | |
483 | ||
52db4b04 JH |
484 | Note that "%f" is the name of the path that is being worked on. Depending |
485 | on the version that is being filtered, the corresponding file on disk may | |
486 | not exist, or may have different contents. So, smudge and clean commands | |
487 | should not try to access the file on disk, but only act as filters on the | |
488 | content provided to them on standard input. | |
aa4ed402 | 489 | |
edcc8581 LS |
490 | Long Running Filter Process |
491 | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ | |
492 | ||
493 | If the filter command (a string value) is defined via | |
494 | `filter.<driver>.process` then Git can process all blobs with a | |
495 | single filter invocation for the entire life of a single Git | |
addad105 JT |
496 | command. This is achieved by using the long-running process protocol |
497 | (described in technical/long-running-process-protocol.txt). | |
498 | ||
499 | When Git encounters the first file that needs to be cleaned or smudged, | |
500 | it starts the filter and performs the handshake. In the handshake, the | |
501 | welcome message sent by Git is "git-filter-client", only version 2 is | |
031fd4b9 | 502 | supported, and the supported capabilities are "clean", "smudge", and |
addad105 | 503 | "delay". |
edcc8581 LS |
504 | |
505 | Afterwards Git sends a list of "key=value" pairs terminated with | |
506 | a flush packet. The list will contain at least the filter command | |
507 | (based on the supported capabilities) and the pathname of the file | |
508 | to filter relative to the repository root. Right after the flush packet | |
509 | Git sends the content split in zero or more pkt-line packets and a | |
510 | flush packet to terminate content. Please note, that the filter | |
511 | must not send any response before it received the content and the | |
c6b0831c LS |
512 | final flush packet. Also note that the "value" of a "key=value" pair |
513 | can contain the "=" character whereas the key would never contain | |
514 | that character. | |
edcc8581 LS |
515 | ------------------------ |
516 | packet: git> command=smudge | |
517 | packet: git> pathname=path/testfile.dat | |
518 | packet: git> 0000 | |
519 | packet: git> CONTENT | |
520 | packet: git> 0000 | |
521 | ------------------------ | |
522 | ||
523 | The filter is expected to respond with a list of "key=value" pairs | |
524 | terminated with a flush packet. If the filter does not experience | |
525 | problems then the list must contain a "success" status. Right after | |
526 | these packets the filter is expected to send the content in zero | |
527 | or more pkt-line packets and a flush packet at the end. Finally, a | |
528 | second list of "key=value" pairs terminated with a flush packet | |
529 | is expected. The filter can change the status in the second list | |
530 | or keep the status as is with an empty list. Please note that the | |
531 | empty list must be terminated with a flush packet regardless. | |
532 | ||
533 | ------------------------ | |
534 | packet: git< status=success | |
535 | packet: git< 0000 | |
536 | packet: git< SMUDGED_CONTENT | |
537 | packet: git< 0000 | |
538 | packet: git< 0000 # empty list, keep "status=success" unchanged! | |
539 | ------------------------ | |
540 | ||
541 | If the result content is empty then the filter is expected to respond | |
542 | with a "success" status and a flush packet to signal the empty content. | |
543 | ------------------------ | |
544 | packet: git< status=success | |
545 | packet: git< 0000 | |
546 | packet: git< 0000 # empty content! | |
547 | packet: git< 0000 # empty list, keep "status=success" unchanged! | |
548 | ------------------------ | |
549 | ||
550 | In case the filter cannot or does not want to process the content, | |
551 | it is expected to respond with an "error" status. | |
552 | ------------------------ | |
553 | packet: git< status=error | |
554 | packet: git< 0000 | |
555 | ------------------------ | |
556 | ||
557 | If the filter experiences an error during processing, then it can | |
558 | send the status "error" after the content was (partially or | |
559 | completely) sent. | |
560 | ------------------------ | |
561 | packet: git< status=success | |
562 | packet: git< 0000 | |
563 | packet: git< HALF_WRITTEN_ERRONEOUS_CONTENT | |
564 | packet: git< 0000 | |
565 | packet: git< status=error | |
566 | packet: git< 0000 | |
567 | ------------------------ | |
568 | ||
569 | In case the filter cannot or does not want to process the content | |
570 | as well as any future content for the lifetime of the Git process, | |
571 | then it is expected to respond with an "abort" status at any point | |
572 | in the protocol. | |
573 | ------------------------ | |
574 | packet: git< status=abort | |
575 | packet: git< 0000 | |
576 | ------------------------ | |
577 | ||
578 | Git neither stops nor restarts the filter process in case the | |
579 | "error"/"abort" status is set. However, Git sets its exit code | |
580 | according to the `filter.<driver>.required` flag, mimicking the | |
581 | behavior of the `filter.<driver>.clean` / `filter.<driver>.smudge` | |
582 | mechanism. | |
583 | ||
584 | If the filter dies during the communication or does not adhere to | |
585 | the protocol then Git will stop the filter process and restart it | |
586 | with the next file that needs to be processed. Depending on the | |
587 | `filter.<driver>.required` flag Git will interpret that as error. | |
588 | ||
2841e8f8 LS |
589 | Delay |
590 | ^^^^^ | |
591 | ||
592 | If the filter supports the "delay" capability, then Git can send the | |
593 | flag "can-delay" after the filter command and pathname. This flag | |
594 | denotes that the filter can delay filtering the current blob (e.g. to | |
595 | compensate network latencies) by responding with no content but with | |
596 | the status "delayed" and a flush packet. | |
597 | ------------------------ | |
598 | packet: git> command=smudge | |
599 | packet: git> pathname=path/testfile.dat | |
600 | packet: git> can-delay=1 | |
601 | packet: git> 0000 | |
602 | packet: git> CONTENT | |
603 | packet: git> 0000 | |
604 | packet: git< status=delayed | |
605 | packet: git< 0000 | |
606 | ------------------------ | |
607 | ||
608 | If the filter supports the "delay" capability then it must support the | |
609 | "list_available_blobs" command. If Git sends this command, then the | |
610 | filter is expected to return a list of pathnames representing blobs | |
611 | that have been delayed earlier and are now available. | |
612 | The list must be terminated with a flush packet followed | |
613 | by a "success" status that is also terminated with a flush packet. If | |
614 | no blobs for the delayed paths are available, yet, then the filter is | |
615 | expected to block the response until at least one blob becomes | |
616 | available. The filter can tell Git that it has no more delayed blobs | |
617 | by sending an empty list. As soon as the filter responds with an empty | |
618 | list, Git stops asking. All blobs that Git has not received at this | |
619 | point are considered missing and will result in an error. | |
620 | ||
621 | ------------------------ | |
622 | packet: git> command=list_available_blobs | |
623 | packet: git> 0000 | |
624 | packet: git< pathname=path/testfile.dat | |
625 | packet: git< pathname=path/otherfile.dat | |
626 | packet: git< 0000 | |
627 | packet: git< status=success | |
628 | packet: git< 0000 | |
629 | ------------------------ | |
630 | ||
631 | After Git received the pathnames, it will request the corresponding | |
632 | blobs again. These requests contain a pathname and an empty content | |
633 | section. The filter is expected to respond with the smudged content | |
634 | in the usual way as explained above. | |
635 | ------------------------ | |
636 | packet: git> command=smudge | |
637 | packet: git> pathname=path/testfile.dat | |
638 | packet: git> 0000 | |
639 | packet: git> 0000 # empty content! | |
640 | packet: git< status=success | |
641 | packet: git< 0000 | |
642 | packet: git< SMUDGED_CONTENT | |
643 | packet: git< 0000 | |
644 | packet: git< 0000 # empty list, keep "status=success" unchanged! | |
645 | ------------------------ | |
646 | ||
647 | Example | |
648 | ^^^^^^^ | |
649 | ||
0f71fa27 LS |
650 | A long running filter demo implementation can be found in |
651 | `contrib/long-running-filter/example.pl` located in the Git | |
652 | core repository. If you develop your own long running filter | |
edcc8581 LS |
653 | process then the `GIT_TRACE_PACKET` environment variables can be |
654 | very helpful for debugging (see linkgit:git[1]). | |
655 | ||
656 | Please note that you cannot use an existing `filter.<driver>.clean` | |
657 | or `filter.<driver>.smudge` command with `filter.<driver>.process` | |
658 | because the former two use a different inter process communication | |
659 | protocol than the latter one. | |
660 | ||
661 | ||
aa4ed402 JH |
662 | Interaction between checkin/checkout attributes |
663 | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | |
664 | ||
665 | In the check-in codepath, the worktree file is first converted | |
666 | with `filter` driver (if specified and corresponding driver | |
667 | defined), then the result is processed with `ident` (if | |
5ec3e670 | 668 | specified), and then finally with `text` (again, if specified |
aa4ed402 JH |
669 | and applicable). |
670 | ||
671 | In the check-out codepath, the blob content is first converted | |
5ec3e670 | 672 | with `text`, and then `ident` and fed to `filter`. |
aa4ed402 JH |
673 | |
674 | ||
f217f0e8 EB |
675 | Merging branches with differing checkin/checkout attributes |
676 | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | |
677 | ||
678 | If you have added attributes to a file that cause the canonical | |
679 | repository format for that file to change, such as adding a | |
680 | clean/smudge filter or text/eol/ident attributes, merging anything | |
681 | where the attribute is not in place would normally cause merge | |
682 | conflicts. | |
683 | ||
2de9b711 | 684 | To prevent these unnecessary merge conflicts, Git can be told to run a |
f217f0e8 EB |
685 | virtual check-out and check-in of all three stages of a file when |
686 | resolving a three-way merge by setting the `merge.renormalize` | |
687 | configuration variable. This prevents changes caused by check-in | |
688 | conversion from causing spurious merge conflicts when a converted file | |
689 | is merged with an unconverted file. | |
690 | ||
691 | As long as a "smudge->clean" results in the same output as a "clean" | |
692 | even on files that are already smudged, this strategy will | |
693 | automatically resolve all filter-related conflicts. Filters that do | |
694 | not act in this way may cause additional merge conflicts that must be | |
695 | resolved manually. | |
696 | ||
697 | ||
88e7fdf2 JH |
698 | Generating diff text |
699 | ~~~~~~~~~~~~~~~~~~~~ | |
700 | ||
4f73e240 JN |
701 | `diff` |
702 | ^^^^^^ | |
703 | ||
2de9b711 TA |
704 | The attribute `diff` affects how Git generates diffs for particular |
705 | files. It can tell Git whether to generate a textual patch for the path | |
678852d9 | 706 | or to treat the path as a binary file. It can also affect what line is |
2de9b711 TA |
707 | shown on the hunk header `@@ -k,l +n,m @@` line, tell Git to use an |
708 | external command to generate the diff, or ask Git to convert binary | |
678852d9 | 709 | files to a text format before generating the diff. |
88e7fdf2 JH |
710 | |
711 | Set:: | |
712 | ||
713 | A path to which the `diff` attribute is set is treated | |
714 | as text, even when they contain byte values that | |
715 | normally never appear in text files, such as NUL. | |
716 | ||
717 | Unset:: | |
718 | ||
719 | A path to which the `diff` attribute is unset will | |
678852d9 JK |
720 | generate `Binary files differ` (or a binary patch, if |
721 | binary patches are enabled). | |
88e7fdf2 JH |
722 | |
723 | Unspecified:: | |
724 | ||
725 | A path to which the `diff` attribute is unspecified | |
726 | first gets its contents inspected, and if it looks like | |
6bf3b813 NTND |
727 | text and is smaller than core.bigFileThreshold, it is treated |
728 | as text. Otherwise it would generate `Binary files differ`. | |
88e7fdf2 | 729 | |
2cc3167c JH |
730 | String:: |
731 | ||
678852d9 JK |
732 | Diff is shown using the specified diff driver. Each driver may |
733 | specify one or more options, as described in the following | |
734 | section. The options for the diff driver "foo" are defined | |
735 | by the configuration variables in the "diff.foo" section of the | |
2de9b711 | 736 | Git config file. |
2cc3167c JH |
737 | |
738 | ||
678852d9 JK |
739 | Defining an external diff driver |
740 | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | |
2cc3167c JH |
741 | |
742 | The definition of a diff driver is done in `gitconfig`, not | |
743 | `gitattributes` file, so strictly speaking this manual page is a | |
744 | wrong place to talk about it. However... | |
745 | ||
678852d9 | 746 | To define an external diff driver `jcdiff`, add a section to your |
2cc3167c JH |
747 | `$GIT_DIR/config` file (or `$HOME/.gitconfig` file) like this: |
748 | ||
749 | ---------------------------------------------------------------- | |
750 | [diff "jcdiff"] | |
751 | command = j-c-diff | |
752 | ---------------------------------------------------------------- | |
753 | ||
2de9b711 | 754 | When Git needs to show you a diff for the path with `diff` |
2cc3167c JH |
755 | attribute set to `jcdiff`, it calls the command you specified |
756 | with the above configuration, i.e. `j-c-diff`, with 7 | |
757 | parameters, just like `GIT_EXTERNAL_DIFF` program is called. | |
9e1f0a85 | 758 | See linkgit:git[1] for details. |
88e7fdf2 JH |
759 | |
760 | ||
ae7aa499 JH |
761 | Defining a custom hunk-header |
762 | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | |
763 | ||
c882c01e | 764 | Each group of changes (called a "hunk") in the textual diff output |
ae7aa499 JH |
765 | is prefixed with a line of the form: |
766 | ||
767 | @@ -k,l +n,m @@ TEXT | |
768 | ||
c882c01e GD |
769 | This is called a 'hunk header'. The "TEXT" portion is by default a line |
770 | that begins with an alphabet, an underscore or a dollar sign; this | |
771 | matches what GNU 'diff -p' output uses. This default selection however | |
772 | is not suited for some contents, and you can use a customized pattern | |
773 | to make a selection. | |
ae7aa499 | 774 | |
c882c01e | 775 | First, in .gitattributes, you would assign the `diff` attribute |
ae7aa499 JH |
776 | for paths. |
777 | ||
778 | ------------------------ | |
779 | *.tex diff=tex | |
780 | ------------------------ | |
781 | ||
edb7e82f | 782 | Then, you would define a "diff.tex.xfuncname" configuration to |
ae7aa499 | 783 | specify a regular expression that matches a line that you would |
c4c86d23 JK |
784 | want to appear as the hunk header "TEXT". Add a section to your |
785 | `$GIT_DIR/config` file (or `$HOME/.gitconfig` file) like this: | |
ae7aa499 JH |
786 | |
787 | ------------------------ | |
788 | [diff "tex"] | |
45d9414f | 789 | xfuncname = "^(\\\\(sub)*section\\{.*)$" |
ae7aa499 JH |
790 | ------------------------ |
791 | ||
792 | Note. A single level of backslashes are eaten by the | |
793 | configuration file parser, so you would need to double the | |
794 | backslashes; the pattern above picks a line that begins with a | |
02783075 | 795 | backslash, and zero or more occurrences of `sub` followed by |
ae7aa499 JH |
796 | `section` followed by open brace, to the end of line. |
797 | ||
798 | There are a few built-in patterns to make this easier, and `tex` | |
799 | is one of them, so you do not have to write the above in your | |
800 | configuration file (you still need to enable this with the | |
d08ed6d6 GH |
801 | attribute mechanism, via `.gitattributes`). The following built in |
802 | patterns are available: | |
803 | ||
e90d065e AJ |
804 | - `ada` suitable for source code in the Ada language. |
805 | ||
2ff6c346 VE |
806 | - `bash` suitable for source code in the Bourne-Again SHell language. |
807 | Covers a superset of POSIX shell function definitions. | |
808 | ||
23b5beb2 GH |
809 | - `bibtex` suitable for files with BibTeX coded references. |
810 | ||
80c49c3d TR |
811 | - `cpp` suitable for source code in the C and C++ languages. |
812 | ||
b221207d PO |
813 | - `csharp` suitable for source code in the C# language. |
814 | ||
0719f3ee WD |
815 | - `css` suitable for cascading style sheets. |
816 | ||
3c81760b SB |
817 | - `dts` suitable for devicetree (DTS) files. |
818 | ||
a807200f ŁN |
819 | - `elixir` suitable for source code in the Elixir language. |
820 | ||
909a5494 BC |
821 | - `fortran` suitable for source code in the Fortran language. |
822 | ||
69f9c87d ZB |
823 | - `fountain` suitable for Fountain documents. |
824 | ||
1dbf0c0a AG |
825 | - `golang` suitable for source code in the Go language. |
826 | ||
af9ce1ff AE |
827 | - `html` suitable for HTML/XHTML documents. |
828 | ||
b66e00f1 | 829 | - `java` suitable for source code in the Java language. |
d08ed6d6 | 830 | |
09dad925 AH |
831 | - `markdown` suitable for Markdown documents. |
832 | ||
2731a784 | 833 | - `matlab` suitable for source code in the MATLAB and Octave languages. |
53b10a14 | 834 | |
5d1e958e JS |
835 | - `objc` suitable for source code in the Objective-C language. |
836 | ||
d08ed6d6 GH |
837 | - `pascal` suitable for source code in the Pascal/Delphi language. |
838 | ||
71a5d4bc JN |
839 | - `perl` suitable for source code in the Perl language. |
840 | ||
af9ce1ff AE |
841 | - `php` suitable for source code in the PHP language. |
842 | ||
7c17205b KS |
843 | - `python` suitable for source code in the Python language. |
844 | ||
d08ed6d6 GH |
845 | - `ruby` suitable for source code in the Ruby language. |
846 | ||
d74e7860 MAL |
847 | - `rust` suitable for source code in the Rust language. |
848 | ||
a4373903 AR |
849 | - `scheme` suitable for source code in the Scheme language. |
850 | ||
d08ed6d6 | 851 | - `tex` suitable for source code for LaTeX documents. |
ae7aa499 JH |
852 | |
853 | ||
80c49c3d TR |
854 | Customizing word diff |
855 | ^^^^^^^^^^^^^^^^^^^^^ | |
856 | ||
882749a0 | 857 | You can customize the rules that `git diff --word-diff` uses to |
80c49c3d | 858 | split words in a line, by specifying an appropriate regular expression |
ae3b970a | 859 | in the "diff.*.wordRegex" configuration variable. For example, in TeX |
80c49c3d TR |
860 | a backslash followed by a sequence of letters forms a command, but |
861 | several such commands can be run together without intervening | |
c4c86d23 JK |
862 | whitespace. To separate them, use a regular expression in your |
863 | `$GIT_DIR/config` file (or `$HOME/.gitconfig` file) like this: | |
80c49c3d TR |
864 | |
865 | ------------------------ | |
866 | [diff "tex"] | |
ae3b970a | 867 | wordRegex = "\\\\[a-zA-Z]+|[{}]|\\\\.|[^\\{}[:space:]]+" |
80c49c3d TR |
868 | ------------------------ |
869 | ||
870 | A built-in pattern is provided for all languages listed in the | |
871 | previous section. | |
872 | ||
873 | ||
678852d9 JK |
874 | Performing text diffs of binary files |
875 | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | |
876 | ||
877 | Sometimes it is desirable to see the diff of a text-converted | |
878 | version of some binary files. For example, a word processor | |
879 | document can be converted to an ASCII text representation, and | |
880 | the diff of the text shown. Even though this conversion loses | |
881 | some information, the resulting diff is useful for human | |
882 | viewing (but cannot be applied directly). | |
883 | ||
884 | The `textconv` config option is used to define a program for | |
885 | performing such a conversion. The program should take a single | |
886 | argument, the name of a file to convert, and produce the | |
887 | resulting text on stdout. | |
888 | ||
889 | For example, to show the diff of the exif information of a | |
890 | file instead of the binary information (assuming you have the | |
c4c86d23 JK |
891 | exif tool installed), add the following section to your |
892 | `$GIT_DIR/config` file (or `$HOME/.gitconfig` file): | |
678852d9 JK |
893 | |
894 | ------------------------ | |
895 | [diff "jpg"] | |
896 | textconv = exif | |
897 | ------------------------ | |
898 | ||
899 | NOTE: The text conversion is generally a one-way conversion; | |
900 | in this example, we lose the actual image contents and focus | |
901 | just on the text data. This means that diffs generated by | |
902 | textconv are _not_ suitable for applying. For this reason, | |
903 | only `git diff` and the `git log` family of commands (i.e., | |
904 | log, whatchanged, show) will perform text conversion. `git | |
905 | format-patch` will never generate this output. If you want to | |
906 | send somebody a text-converted diff of a binary file (e.g., | |
907 | because it quickly conveys the changes you have made), you | |
908 | should generate it separately and send it as a comment _in | |
909 | addition to_ the usual binary diff that you might send. | |
910 | ||
d9bae1a1 | 911 | Because text conversion can be slow, especially when doing a |
2de9b711 | 912 | large number of them with `git log -p`, Git provides a mechanism |
d9bae1a1 JK |
913 | to cache the output and use it in future diffs. To enable |
914 | caching, set the "cachetextconv" variable in your diff driver's | |
915 | config. For example: | |
916 | ||
917 | ------------------------ | |
918 | [diff "jpg"] | |
919 | textconv = exif | |
920 | cachetextconv = true | |
921 | ------------------------ | |
922 | ||
923 | This will cache the result of running "exif" on each blob | |
924 | indefinitely. If you change the textconv config variable for a | |
2de9b711 | 925 | diff driver, Git will automatically invalidate the cache entries |
d9bae1a1 JK |
926 | and re-run the textconv filter. If you want to invalidate the |
927 | cache manually (e.g., because your version of "exif" was updated | |
928 | and now produces better output), you can remove the cache | |
929 | manually with `git update-ref -d refs/notes/textconv/jpg` (where | |
930 | "jpg" is the name of the diff driver, as in the example above). | |
678852d9 | 931 | |
55601c6a JK |
932 | Choosing textconv versus external diff |
933 | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | |
934 | ||
935 | If you want to show differences between binary or specially-formatted | |
936 | blobs in your repository, you can choose to use either an external diff | |
937 | command, or to use textconv to convert them to a diff-able text format. | |
938 | Which method you choose depends on your exact situation. | |
939 | ||
940 | The advantage of using an external diff command is flexibility. You are | |
941 | not bound to find line-oriented changes, nor is it necessary for the | |
942 | output to resemble unified diff. You are free to locate and report | |
943 | changes in the most appropriate way for your data format. | |
944 | ||
945 | A textconv, by comparison, is much more limiting. You provide a | |
2de9b711 | 946 | transformation of the data into a line-oriented text format, and Git |
55601c6a JK |
947 | uses its regular diff tools to generate the output. There are several |
948 | advantages to choosing this method: | |
949 | ||
950 | 1. Ease of use. It is often much simpler to write a binary to text | |
951 | transformation than it is to perform your own diff. In many cases, | |
952 | existing programs can be used as textconv filters (e.g., exif, | |
953 | odt2txt). | |
954 | ||
955 | 2. Git diff features. By performing only the transformation step | |
2de9b711 | 956 | yourself, you can still utilize many of Git's diff features, |
55601c6a JK |
957 | including colorization, word-diff, and combined diffs for merges. |
958 | ||
959 | 3. Caching. Textconv caching can speed up repeated diffs, such as those | |
960 | you might trigger by running `git log -p`. | |
961 | ||
962 | ||
ab435611 JK |
963 | Marking files as binary |
964 | ^^^^^^^^^^^^^^^^^^^^^^^ | |
965 | ||
966 | Git usually guesses correctly whether a blob contains text or binary | |
967 | data by examining the beginning of the contents. However, sometimes you | |
968 | may want to override its decision, either because a blob contains binary | |
969 | data later in the file, or because the content, while technically | |
970 | composed of text characters, is opaque to a human reader. For example, | |
f745acb0 | 971 | many postscript files contain only ASCII characters, but produce noisy |
ab435611 JK |
972 | and meaningless diffs. |
973 | ||
974 | The simplest way to mark a file as binary is to unset the diff | |
975 | attribute in the `.gitattributes` file: | |
976 | ||
977 | ------------------------ | |
978 | *.ps -diff | |
979 | ------------------------ | |
980 | ||
2de9b711 | 981 | This will cause Git to generate `Binary files differ` (or a binary |
ab435611 JK |
982 | patch, if binary patches are enabled) instead of a regular diff. |
983 | ||
984 | However, one may also want to specify other diff driver attributes. For | |
985 | example, you might want to use `textconv` to convert postscript files to | |
f745acb0 | 986 | an ASCII representation for human viewing, but otherwise treat them as |
ab435611 JK |
987 | binary files. You cannot specify both `-diff` and `diff=ps` attributes. |
988 | The solution is to use the `diff.*.binary` config option: | |
989 | ||
990 | ------------------------ | |
991 | [diff "ps"] | |
992 | textconv = ps2ascii | |
993 | binary = true | |
994 | ------------------------ | |
995 | ||
88e7fdf2 JH |
996 | Performing a three-way merge |
997 | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | |
998 | ||
4f73e240 JN |
999 | `merge` |
1000 | ^^^^^^^ | |
1001 | ||
b547ce0b | 1002 | The attribute `merge` affects how three versions of a file are |
88e7fdf2 | 1003 | merged when a file-level merge is necessary during `git merge`, |
57f6ec02 | 1004 | and other commands such as `git revert` and `git cherry-pick`. |
88e7fdf2 JH |
1005 | |
1006 | Set:: | |
1007 | ||
1008 | Built-in 3-way merge driver is used to merge the | |
2fd02c92 | 1009 | contents in a way similar to 'merge' command of `RCS` |
88e7fdf2 JH |
1010 | suite. This is suitable for ordinary text files. |
1011 | ||
1012 | Unset:: | |
1013 | ||
1014 | Take the version from the current branch as the | |
1015 | tentative merge result, and declare that the merge has | |
b547ce0b | 1016 | conflicts. This is suitable for binary files that do |
88e7fdf2 JH |
1017 | not have a well-defined merge semantics. |
1018 | ||
1019 | Unspecified:: | |
1020 | ||
1021 | By default, this uses the same built-in 3-way merge | |
b547ce0b AS |
1022 | driver as is the case when the `merge` attribute is set. |
1023 | However, the `merge.default` configuration variable can name | |
1024 | different merge driver to be used with paths for which the | |
88e7fdf2 JH |
1025 | `merge` attribute is unspecified. |
1026 | ||
2cc3167c | 1027 | String:: |
88e7fdf2 JH |
1028 | |
1029 | 3-way merge is performed using the specified custom | |
1030 | merge driver. The built-in 3-way merge driver can be | |
1031 | explicitly specified by asking for "text" driver; the | |
1032 | built-in "take the current branch" driver can be | |
b9d14ffb | 1033 | requested with "binary". |
88e7fdf2 JH |
1034 | |
1035 | ||
0e545f75 JH |
1036 | Built-in merge drivers |
1037 | ^^^^^^^^^^^^^^^^^^^^^^ | |
1038 | ||
1039 | There are a few built-in low-level merge drivers defined that | |
1040 | can be asked for via the `merge` attribute. | |
1041 | ||
1042 | text:: | |
1043 | ||
1044 | Usual 3-way file level merge for text files. Conflicted | |
1045 | regions are marked with conflict markers `<<<<<<<`, | |
1046 | `=======` and `>>>>>>>`. The version from your branch | |
1047 | appears before the `=======` marker, and the version | |
1048 | from the merged branch appears after the `=======` | |
1049 | marker. | |
1050 | ||
1051 | binary:: | |
1052 | ||
1053 | Keep the version from your branch in the work tree, but | |
1054 | leave the path in the conflicted state for the user to | |
1055 | sort out. | |
1056 | ||
1057 | union:: | |
1058 | ||
1059 | Run 3-way file level merge for text files, but take | |
1060 | lines from both versions, instead of leaving conflict | |
1061 | markers. This tends to leave the added lines in the | |
1062 | resulting file in random order and the user should | |
1063 | verify the result. Do not use this if you do not | |
1064 | understand the implications. | |
1065 | ||
1066 | ||
88e7fdf2 JH |
1067 | Defining a custom merge driver |
1068 | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | |
1069 | ||
0e545f75 JH |
1070 | The definition of a merge driver is done in the `.git/config` |
1071 | file, not in the `gitattributes` file, so strictly speaking this | |
1072 | manual page is a wrong place to talk about it. However... | |
88e7fdf2 JH |
1073 | |
1074 | To define a custom merge driver `filfre`, add a section to your | |
1075 | `$GIT_DIR/config` file (or `$HOME/.gitconfig` file) like this: | |
1076 | ||
1077 | ---------------------------------------------------------------- | |
1078 | [merge "filfre"] | |
1079 | name = feel-free merge driver | |
ef45bb1f | 1080 | driver = filfre %O %A %B %L %P |
88e7fdf2 JH |
1081 | recursive = binary |
1082 | ---------------------------------------------------------------- | |
1083 | ||
1084 | The `merge.*.name` variable gives the driver a human-readable | |
1085 | name. | |
1086 | ||
1087 | The `merge.*.driver` variable's value is used to construct a | |
1088 | command to run to merge ancestor's version (`%O`), current | |
1089 | version (`%A`) and the other branches' version (`%B`). These | |
1090 | three tokens are replaced with the names of temporary files that | |
1091 | hold the contents of these versions when the command line is | |
16758621 BW |
1092 | built. Additionally, %L will be replaced with the conflict marker |
1093 | size (see below). | |
88e7fdf2 JH |
1094 | |
1095 | The merge driver is expected to leave the result of the merge in | |
1096 | the file named with `%A` by overwriting it, and exit with zero | |
1097 | status if it managed to merge them cleanly, or non-zero if there | |
1098 | were conflicts. | |
1099 | ||
1100 | The `merge.*.recursive` variable specifies what other merge | |
1101 | driver to use when the merge driver is called for an internal | |
1102 | merge between common ancestors, when there are more than one. | |
1103 | When left unspecified, the driver itself is used for both | |
1104 | internal merge and the final merge. | |
1105 | ||
ef45bb1f JH |
1106 | The merge driver can learn the pathname in which the merged result |
1107 | will be stored via placeholder `%P`. | |
1108 | ||
88e7fdf2 | 1109 | |
4c734803 JH |
1110 | `conflict-marker-size` |
1111 | ^^^^^^^^^^^^^^^^^^^^^^ | |
1112 | ||
1113 | This attribute controls the length of conflict markers left in | |
1114 | the work tree file during a conflicted merge. Only setting to | |
1115 | the value to a positive integer has any meaningful effect. | |
1116 | ||
1117 | For example, this line in `.gitattributes` can be used to tell the merge | |
1118 | machinery to leave much longer (instead of the usual 7-character-long) | |
1119 | conflict markers when merging the file `Documentation/git-merge.txt` | |
1120 | results in a conflict. | |
1121 | ||
1122 | ------------------------ | |
1123 | Documentation/git-merge.txt conflict-marker-size=32 | |
1124 | ------------------------ | |
1125 | ||
1126 | ||
cf1b7869 JH |
1127 | Checking whitespace errors |
1128 | ~~~~~~~~~~~~~~~~~~~~~~~~~~ | |
1129 | ||
1130 | `whitespace` | |
1131 | ^^^^^^^^^^^^ | |
1132 | ||
1133 | The `core.whitespace` configuration variable allows you to define what | |
2fd02c92 | 1134 | 'diff' and 'apply' should consider whitespace errors for all paths in |
5162e697 | 1135 | the project (See linkgit:git-config[1]). This attribute gives you finer |
cf1b7869 JH |
1136 | control per path. |
1137 | ||
1138 | Set:: | |
1139 | ||
2de9b711 | 1140 | Notice all types of potential whitespace errors known to Git. |
f4b05a49 JS |
1141 | The tab width is taken from the value of the `core.whitespace` |
1142 | configuration variable. | |
cf1b7869 JH |
1143 | |
1144 | Unset:: | |
1145 | ||
1146 | Do not notice anything as error. | |
1147 | ||
1148 | Unspecified:: | |
1149 | ||
f4b05a49 | 1150 | Use the value of the `core.whitespace` configuration variable to |
cf1b7869 JH |
1151 | decide what to notice as error. |
1152 | ||
1153 | String:: | |
1154 | ||
1155 | Specify a comma separate list of common whitespace problems to | |
f4b05a49 | 1156 | notice in the same format as the `core.whitespace` configuration |
cf1b7869 JH |
1157 | variable. |
1158 | ||
1159 | ||
8a33dd8b JH |
1160 | Creating an archive |
1161 | ~~~~~~~~~~~~~~~~~~~ | |
1162 | ||
08b51f51 JH |
1163 | `export-ignore` |
1164 | ^^^^^^^^^^^^^^^ | |
1165 | ||
1166 | Files and directories with the attribute `export-ignore` won't be added to | |
1167 | archive files. | |
1168 | ||
8a33dd8b JH |
1169 | `export-subst` |
1170 | ^^^^^^^^^^^^^^ | |
1171 | ||
2de9b711 | 1172 | If the attribute `export-subst` is set for a file then Git will expand |
8a33dd8b | 1173 | several placeholders when adding this file to an archive. The |
08b51f51 | 1174 | expansion depends on the availability of a commit ID, i.e., if |
8a33dd8b JH |
1175 | linkgit:git-archive[1] has been given a tree instead of a commit or a |
1176 | tag then no replacement will be done. The placeholders are the same | |
1177 | as those for the option `--pretty=format:` of linkgit:git-log[1], | |
1178 | except that they need to be wrapped like this: `$Format:PLACEHOLDERS$` | |
1179 | in the file. E.g. the string `$Format:%H$` will be replaced by the | |
96099726 RS |
1180 | commit hash. However, only one `%(describe)` placeholder is expanded |
1181 | per archive to avoid denial-of-service attacks. | |
8a33dd8b JH |
1182 | |
1183 | ||
975457f1 NG |
1184 | Packing objects |
1185 | ~~~~~~~~~~~~~~~ | |
1186 | ||
1187 | `delta` | |
1188 | ^^^^^^^ | |
1189 | ||
1190 | Delta compression will not be attempted for blobs for paths with the | |
1191 | attribute `delta` set to false. | |
1192 | ||
1193 | ||
a2df1fb2 AG |
1194 | Viewing files in GUI tools |
1195 | ~~~~~~~~~~~~~~~~~~~~~~~~~~ | |
1196 | ||
1197 | `encoding` | |
1198 | ^^^^^^^^^^ | |
1199 | ||
1200 | The value of this attribute specifies the character encoding that should | |
1201 | be used by GUI tools (e.g. linkgit:gitk[1] and linkgit:git-gui[1]) to | |
1202 | display the contents of the relevant file. Note that due to performance | |
1203 | considerations linkgit:gitk[1] does not use this attribute unless you | |
1204 | manually enable per-file encodings in its options. | |
1205 | ||
1206 | If this attribute is not set or has an invalid value, the value of the | |
1207 | `gui.encoding` configuration variable is used instead | |
1208 | (See linkgit:git-config[1]). | |
1209 | ||
1210 | ||
0922570c | 1211 | USING MACRO ATTRIBUTES |
bbb896d8 JH |
1212 | ---------------------- |
1213 | ||
1214 | You do not want any end-of-line conversions applied to, nor textual diffs | |
1215 | produced for, any binary file you track. You would need to specify e.g. | |
1216 | ||
1217 | ------------ | |
5ec3e670 | 1218 | *.jpg -text -diff |
bbb896d8 JH |
1219 | ------------ |
1220 | ||
1221 | but that may become cumbersome, when you have many attributes. Using | |
0922570c | 1222 | macro attributes, you can define an attribute that, when set, also |
98e84066 | 1223 | sets or unsets a number of other attributes at the same time. The |
0922570c | 1224 | system knows a built-in macro attribute, `binary`: |
bbb896d8 JH |
1225 | |
1226 | ------------ | |
1227 | *.jpg binary | |
1228 | ------------ | |
1229 | ||
98e84066 | 1230 | Setting the "binary" attribute also unsets the "text" and "diff" |
0922570c | 1231 | attributes as above. Note that macro attributes can only be "Set", |
98e84066 MH |
1232 | though setting one might have the effect of setting or unsetting other |
1233 | attributes or even returning other attributes to the "Unspecified" | |
1234 | state. | |
bbb896d8 JH |
1235 | |
1236 | ||
0922570c | 1237 | DEFINING MACRO ATTRIBUTES |
bbb896d8 JH |
1238 | ------------------------- |
1239 | ||
e78e6967 MH |
1240 | Custom macro attributes can be defined only in top-level gitattributes |
1241 | files (`$GIT_DIR/info/attributes`, the `.gitattributes` file at the | |
1242 | top level of the working tree, or the global or system-wide | |
1243 | gitattributes files), not in `.gitattributes` files in working tree | |
1244 | subdirectories. The built-in macro attribute "binary" is equivalent | |
1245 | to: | |
bbb896d8 JH |
1246 | |
1247 | ------------ | |
155a4b71 | 1248 | [attr]binary -diff -merge -text |
bbb896d8 JH |
1249 | ------------ |
1250 | ||
8ff06de1 JK |
1251 | NOTES |
1252 | ----- | |
1253 | ||
1254 | Git does not follow symbolic links when accessing a `.gitattributes` | |
1255 | file in the working tree. This keeps behavior consistent when the file | |
1256 | is accessed from the index or a tree versus from the filesystem. | |
bbb896d8 | 1257 | |
76a8788c NTND |
1258 | EXAMPLES |
1259 | -------- | |
88e7fdf2 JH |
1260 | |
1261 | If you have these three `gitattributes` file: | |
1262 | ||
1263 | ---------------------------------------------------------------- | |
1264 | (in $GIT_DIR/info/attributes) | |
1265 | ||
1266 | a* foo !bar -baz | |
1267 | ||
1268 | (in .gitattributes) | |
1269 | abc foo bar baz | |
1270 | ||
1271 | (in t/.gitattributes) | |
1272 | ab* merge=filfre | |
1273 | abc -foo -bar | |
1274 | *.c frotz | |
1275 | ---------------------------------------------------------------- | |
1276 | ||
1277 | the attributes given to path `t/abc` are computed as follows: | |
1278 | ||
1279 | 1. By examining `t/.gitattributes` (which is in the same | |
2de9b711 | 1280 | directory as the path in question), Git finds that the first |
88e7fdf2 JH |
1281 | line matches. `merge` attribute is set. It also finds that |
1282 | the second line matches, and attributes `foo` and `bar` | |
1283 | are unset. | |
1284 | ||
1285 | 2. Then it examines `.gitattributes` (which is in the parent | |
1286 | directory), and finds that the first line matches, but | |
1287 | `t/.gitattributes` file already decided how `merge`, `foo` | |
1288 | and `bar` attributes should be given to this path, so it | |
1289 | leaves `foo` and `bar` unset. Attribute `baz` is set. | |
1290 | ||
5c759f96 | 1291 | 3. Finally it examines `$GIT_DIR/info/attributes`. This file |
88e7fdf2 JH |
1292 | is used to override the in-tree settings. The first line is |
1293 | a match, and `foo` is set, `bar` is reverted to unspecified | |
1294 | state, and `baz` is unset. | |
1295 | ||
02783075 | 1296 | As the result, the attributes assignment to `t/abc` becomes: |
88e7fdf2 JH |
1297 | |
1298 | ---------------------------------------------------------------- | |
1299 | foo set to true | |
1300 | bar unspecified | |
1301 | baz set to false | |
1302 | merge set to string value "filfre" | |
1303 | frotz unspecified | |
1304 | ---------------------------------------------------------------- | |
1305 | ||
1306 | ||
cde15181 MH |
1307 | SEE ALSO |
1308 | -------- | |
1309 | linkgit:git-check-attr[1]. | |
8460b2fc | 1310 | |
88e7fdf2 JH |
1311 | GIT |
1312 | --- | |
9e1f0a85 | 1313 | Part of the linkgit:git[1] suite |