1 Like other projects, we also have some guidelines to keep to the
2 code. For Git in general, a few rough rules are:
4 - Most importantly, we never say "It's in POSIX; we'll happily
5 ignore your needs should your system not conform to it."
6 We live in the real world.
8 - However, we often say "Let's stay away from that construct,
9 it's not even in POSIX".
11 - In spite of the above two rules, we sometimes say "Although
12 this is not in POSIX, it (is so convenient | makes the code
13 much more readable | has other good characteristics) and
14 practically all the platforms we care about support it, so
17 Again, we live in the real world, and it is sometimes a
18 judgement call, the decision based more on real world
19 constraints people face than what the paper standard says.
21 - Fixing style violations while working on a real change as a
22 preparatory clean-up step is good, but otherwise avoid useless code
23 churn for the sake of conforming to the style.
25 "Once it _is_ in the tree, it's not really worth the patch noise to
27 Cf. https://lore.kernel.org/all/20100126160632.3bdbe172.akpm@linux-foundation.org/
29 - Log messages to explain your changes are as important as the
30 changes themselves. Clearly written code and in-code comments
31 explain how the code works and what is assumed from the surrounding
32 context. The log messages explain what the changes wanted to
33 achieve and why the changes were necessary (more on this in the
34 accompanying SubmittingPatches document).
36 Make your code readable and sensible, and don't try to be clever.
38 As for more concrete guidelines, just imitate the existing code
39 (this is a good guideline, no matter which project you are
40 contributing to). It is always preferable to match the _local_
41 convention. New code added to Git suite is expected to match
42 the overall style of existing code. Modifications to existing
43 code is expected to match the style the surrounding code already
44 uses (even if it doesn't match the overall style of existing code).
46 But if you must have a list of rules, here are some language
47 specific ones. Note that Documentation/ToolsForGit.txt document
48 has a collection of tips to help you use some external tools
49 to conform to these guidelines.
51 For shell scripts specifically (not exhaustive):
53 - We use tabs for indentation.
55 - Case arms are indented at the same depth as case and esac lines,
67 - Redirection operators should be written with space before, but no
68 space after them. In other words, write 'echo test >"$file"'
69 instead of 'echo test> $file' or 'echo test > $file'. Note that
70 even though it is not required by POSIX to double-quote the
71 redirection target in a variable (as shown above), our code does so
72 because some versions of bash issue a warning without the quotes.
75 cat hello > world < universe
79 cat hello >world <universe
82 - We prefer $( ... ) for command substitution; unlike ``, it
83 properly nests. It should have been the way Bourne spelled
84 it from day one, but unfortunately isn't.
86 - If you want to find out if a command is available on the user's
87 $PATH, you should use 'type <command>', instead of 'which <command>'.
88 The output of 'which' is not machine parsable and its exit code
89 is not reliable across platforms.
91 - We use POSIX compliant parameter substitutions and avoid bashisms;
94 - We use ${parameter-word} and its [-=?+] siblings, and their
95 colon'ed "unset or null" form.
97 - We use ${parameter#word} and its [#%] siblings, and their
98 doubled "longest matching" form.
100 - No "Substring Expansion" ${parameter:offset:length}.
104 - No pattern replacement ${parameter/pattern/string}.
106 - We use Arithmetic Expansion $(( ... )).
108 - We do not use Process Substitution <(list) or >(list).
110 - Do not write control structures on a single line with semicolon.
111 "then" should be on the next line for if statements, and "do"
112 should be on the next line for "while" and "for".
115 if test -f hello; then
125 - If a command sequence joined with && or || or | spans multiple
126 lines, put each command on a separate line and put && and || and |
127 operators at the end of each line, rather than the start. This
128 means you don't need to use \ to join lines, since the above
129 operators imply the sequence isn't finished.
132 grep blob verify_pack_result \
133 | awk -f print_1.awk \
138 grep blob verify_pack_result |
143 - We prefer "test" over "[ ... ]".
145 - We do not write the noiseword "function" in front of shell
148 - We prefer a space between the function name and the parentheses,
149 and no space inside the parentheses. The opening "{" should also
160 - As to use of grep, stick to a subset of BRE (namely, no \{m,n\},
161 [::], [==], or [..]) for portability.
163 - We do not use \{m,n\};
165 - We do not use ? or + (which are \{0,1\} and \{1,\}
166 respectively in BRE) but that goes without saying as these
167 are ERE elements not BRE (note that \? and \+ are not even part
168 of BRE -- making them accessible from BRE is a GNU extension).
170 - Use Git's gettext wrappers in git-sh-i18n to make the user
171 interface translatable. See "Marking strings for translation" in
174 - We do not write our "test" command with "-a" and "-o" and use "&&"
175 or "||" to concatenate multiple "test" commands instead, because
176 the use of "-a/-o" is often error-prone. E.g.
178 test -n "$x" -a "$a" = "$b"
180 is buggy and breaks when $x is "=", but
182 test -n "$x" && test "$a" = "$b"
184 does not have such a problem.
186 - Even though "local" is not part of POSIX, we make heavy use of it
187 in our test suite. We do not use it in scripted Porcelains, and
188 hopefully nobody starts using "local" before they are reimplemented
191 - Use octal escape sequences (e.g. "\302\242"), not hexadecimal (e.g.
192 "\xc2\xa2") in printf format strings, since hexadecimal escape
193 sequences are not portable.
198 - We use tabs to indent, and interpret tabs as taking up to
201 - We try to keep to at most 80 characters per line.
203 - As a Git developer we assume you have a reasonably modern compiler
204 and we recommend you to enable the DEVELOPER makefile knob to
205 ensure your patch is clear of all compiler warnings we care about,
206 by e.g. "echo DEVELOPER=1 >>config.mak".
208 - We try to support a wide range of C compilers to compile Git with,
209 including old ones. As of Git v2.35.0 Git requires C99 (we check
210 "__STDC_VERSION__"). You should not use features from a newer C
211 standard, even if your compiler groks them.
213 New C99 features have been phased in gradually, if something's new
214 in C99 but not used yet don't assume that it's safe to use, some
215 compilers we target have only partial support for it. These are
216 considered safe to use:
218 . since around 2007 with 2b6854c863a, we have been using
219 initializer elements which are not computable at load time. E.g.:
221 const char *args[] = {"constant", variable, NULL};
223 . since early 2012 with e1327023ea, we have been using an enum
224 definition whose last element is followed by a comma. This, like
225 an array initializer that ends with a trailing comma, can be used
226 to reduce the patch noise when adding a new identifier at the end.
228 . since mid 2017 with cbc0f81d, we have been using designated
229 initializers for struct (e.g. "struct t v = { .val = 'a' };").
231 . since mid 2017 with 512f41cf, we have been using designated
232 initializers for array (e.g. "int array[10] = { [5] = 2 }").
234 . since early 2021 with 765dc168882, we have been using variadic
235 macros, mostly for printf-like trace and debug macros.
237 . since late 2021 with 44ba10d6, we have had variables declared in
238 the for loop "for (int i = 0; i < 10; i++)".
240 New C99 features that we cannot use yet:
242 . %z and %zu as a printf() argument for a size_t (the %z being for
243 the POSIX-specific ssize_t). Instead you should use
244 printf("%"PRIuMAX, (uintmax_t)v). These days the MSVC version we
245 rely on supports %z, but the C library used by MinGW does not.
247 . Shorthand like ".a.b = *c" in struct initializations is known to
248 trip up an older IBM XLC version, use ".a = { .b = *c }" instead.
249 See the 33665d98 (reftable: make assignments portable to AIX xlc
252 - Variables have to be declared at the beginning of the block, before
253 the first statement (i.e. -Wdeclaration-after-statement).
255 - NULL pointers shall be written as NULL, not as 0.
257 - When declaring pointers, the star sides with the variable
258 name, i.e. "char *string", not "char* string" or
259 "char * string". This makes it easier to understand code
260 like "char *string, c;".
262 - Use whitespace around operators and keywords, but not inside
263 parentheses and not around functions. So:
273 - Do not explicitly compare an integral value with constant 0 or '\0',
274 or a pointer value with constant NULL. For instance, to validate that
275 counted array <ptr, cnt> is initialized but has no elements, write:
278 BUG("empty array expected");
282 if (ptr == NULL || cnt != 0);
283 BUG("empty array expected");
285 - We avoid using braces unnecessarily. I.e.
291 is frowned upon. But there are a few exceptions:
293 - When the statement extends over a few lines (e.g., a while loop
294 with an embedded conditional, or a comment). E.g.:
305 * This one requires some explanation,
306 * so we're better off with braces to make
307 * it obvious that the indentation is correct.
312 - When there are multiple arms to a conditional and some of them
313 require braces, enclose even a single line block in braces for
324 - We try to avoid assignments in the condition of an "if" statement.
326 - Try to make your code understandable. You may put comments
327 in, but comments invariably tend to stale out when the code
328 they were describing changes. Often splitting a function
329 into two makes the intention of the code much clearer.
331 - Multi-line comments include their delimiters on separate lines from
336 * multi-line comment.
339 Note however that a comment that explains a translatable string to
340 translators uses a convention of starting with a magic token
341 "TRANSLATORS: ", e.g.
344 * TRANSLATORS: here is a comment that explains the string to
345 * be translated, that follows immediately after it.
347 _("Here is a translatable string explained by the above.");
349 - Double negation is often harder to understand than no negation
352 - There are two schools of thought when it comes to comparison,
353 especially inside a loop. Some people prefer to have the less stable
354 value on the left hand side and the more stable value on the right hand
355 side, e.g. if you have a loop that counts variable i down to the
358 while (i > lower_bound) {
363 Other people prefer to have the textual order of values match the
364 actual order of values in their comparison, so that they can
365 mentally draw a number line from left to right and place these
366 values in order, i.e.
368 while (lower_bound < i) {
373 Both are valid, and we use both. However, the more "stable" the
374 stable side becomes, the more we tend to prefer the former
375 (comparison with a constant, "i > 0", is an extreme example).
376 Just do not mix styles in the same part of the code and mimic
377 existing styles in the neighbourhood.
379 - There are two schools of thought when it comes to splitting a long
380 logical line into multiple lines. Some people push the second and
381 subsequent lines far enough to the right with tabs and align them:
383 if (the_beginning_of_a_very_long_expression_that_has_to ||
384 span_more_than_a_single_line_of ||
388 while other people prefer to align the second and the subsequent
389 lines with the column immediately inside the opening parenthesis,
390 with tabs and spaces, following our "tabstop is always a multiple
393 if (the_beginning_of_a_very_long_expression_that_has_to ||
394 span_more_than_a_single_line_of ||
398 Both are valid, and we use both. Again, just do not mix styles in
399 the same part of the code and mimic existing styles in the
402 - When splitting a long logical line, some people change line before
403 a binary operator, so that the result looks like a parse tree when
404 you turn your head 90-degrees counterclockwise:
406 if (the_beginning_of_a_very_long_expression_that_has_to
407 || span_more_than_a_single_line_of_the_source_text) {
409 while other people prefer to leave the operator at the end of the
412 if (the_beginning_of_a_very_long_expression_that_has_to ||
413 span_more_than_a_single_line_of_the_source_text) {
415 Both are valid, but we tend to use the latter more, unless the
416 expression gets fairly complex, in which case the former tends to
417 be easier to read. Again, just do not mix styles in the same part
418 of the code and mimic existing styles in the neighbourhood.
420 - When splitting a long logical line, with everything else being
421 equal, it is preferable to split after the operator at higher
422 level in the parse tree. That is, this is more preferable:
424 if (a_very_long_variable * that_is_used_in +
425 a_very_long_expression) {
430 if (a_very_long_variable *
431 that_is_used_in + a_very_long_expression) {
434 - Some clever tricks, like using the !! operator with arithmetic
435 constructs, can be extremely confusing to others. Avoid them,
436 unless there is a compelling reason to use them.
438 - Use the API. No, really. We have a strbuf (variable length
439 string), several arrays with the ALLOC_GROW() macro, a
440 string_list for sorted string lists, a hash map (mapping struct
441 objects) named "struct decorate", amongst other things.
443 - When you come up with an API, document its functions and structures
444 in the header file that exposes the API to its callers. Use what is
445 in "strbuf.h" as a model for the appropriate tone and level of
448 - The first #include in C files, except in platform specific compat/
449 implementations and sha1dc/, must be either "git-compat-util.h" or
450 one of the approved headers that includes it first for you. (The
451 approved headers currently include "builtin.h",
452 "t/helper/test-tool.h", "xdiff/xinclude.h", or
453 "reftable/system.h"). You do not have to include more than one of
456 - A C file must directly include the header files that declare the
457 functions and the types it uses, except for the functions and types
458 that are made available to it by including one of the header files
459 it must include by the previous rule.
461 - If you are planning a new command, consider writing it in shell
462 or perl first, so that changes in semantics can be easily
463 changed and discussed. Many Git commands started out like
464 that, and a few are still scripts.
466 - Avoid introducing a new dependency into Git. This means you
467 usually should stay away from scripting languages not already
468 used in the Git core command set (unless your command is clearly
469 separate from it, such as an importer to convert random-scm-X
470 repositories to Git).
472 - When we pass <string, length> pair to functions, we should try to
473 pass them in that order.
475 - Use Git's gettext wrappers to make the user interface
476 translatable. See "Marking strings for translation" in po/README.
478 - Variables and functions local to a given source file should be marked
479 with "static". Variables that are visible to other source files
480 must be declared with "extern" in header files. However, function
481 declarations should not use "extern", as that is already the default.
483 - You can launch gdb around your program using the shorthand GIT_DEBUGGER.
484 Run `GIT_DEBUGGER=1 ./bin-wrappers/git foo` to simply use gdb as is, or
485 run `GIT_DEBUGGER="<debugger> <debugger-args>" ./bin-wrappers/git foo` to
486 use your own debugger and arguments. Example: `GIT_DEBUGGER="ddd --gdb"
487 ./bin-wrappers/git log` (See `wrap-for-bin.sh`.)
491 - Most of the C guidelines above apply.
493 - We try to support Perl 5.8 and later ("use Perl 5.008").
495 - use strict and use warnings are strongly preferred.
497 - Don't overuse statement modifiers unless using them makes the
498 result easier to follow.
501 do_this() unless (condition);
502 ... do something else ...
504 is more readable than:
510 ... do something else ...
512 *only* when the condition is so rare that do_this() will be almost
515 - We try to avoid assignments inside "if ()" conditions.
517 - Learn and use Git.pm if you need that functionality.
521 - We follow PEP-8 (http://www.python.org/dev/peps/pep-0008/).
523 - As a minimum, we aim to be compatible with Python 2.7.
525 - Where required libraries do not restrict us to Python 2, we try to
526 also be compatible with Python 3.1 and later.
531 We make a distinction between a Git command's primary output and
532 output which is merely chatty feedback (for instance, status
533 messages, running transcript, or progress display), as well as error
534 messages. Roughly speaking, a Git command's primary output is that
535 which one might want to capture to a file or send down a pipe; its
536 chatty output should not interfere with these use-cases.
538 As such, primary output should be sent to the standard output stream
539 (stdout), and chatty output should be sent to the standard error
540 stream (stderr). Examples of commands which produce primary output
541 include `git log`, `git show`, and `git branch --list` which generate
542 output on the stdout stream.
544 Not all Git commands have primary output; this is often true of
545 commands whose main function is to perform an action. Some action
546 commands are silent, whereas others are chatty. An example of a
547 chatty action commands is `git clone` with its "Cloning into
548 '<path>'..." and "Checking connectivity..." status messages which it
549 sends to the stderr stream.
551 Error messages from Git commands should always be sent to the stderr
557 - Do not end error messages with a full stop.
559 - Do not capitalize the first word, only because it is the first word
560 in the message ("unable to open %s", not "Unable to open %s"). But
561 "SHA-3 not supported" is fine, because the reason the first word is
562 capitalized is not because it is at the beginning of the sentence,
563 but because the word would be spelled in capital letters even when
564 it appeared in the middle of the sentence.
566 - Say what the error is first ("cannot open %s", not "%s: cannot open")
569 Externally Visible Names
571 - For configuration variable names, follow the existing convention:
573 . The section name indicates the affected subsystem.
575 . The subsection name, if any, indicates which of an unbounded set
576 of things to set the value for.
578 . The variable name describes the effect of tweaking this knob.
580 The section and variable names that consist of multiple words are
581 formed by concatenating the words without punctuations (e.g. `-`),
582 and are broken using bumpyCaps in documentation as a hint to the
585 When choosing the variable namespace, do not use variable name for
586 specifying possibly unbounded set of things, most notably anything
587 an end user can freely come up with (e.g. branch names). Instead,
588 use subsection names or variable values, like the existing variable
589 branch.<name>.description does.
592 Writing Documentation:
594 Most (if not all) of the documentation pages are written in the
595 AsciiDoc format in *.txt files (e.g. Documentation/git.txt), and
596 processed into HTML and manpages (e.g. git.html and git.1 in the
599 The documentation liberally mixes US and UK English (en_US/UK)
600 norms for spelling and grammar, which is somewhat unfortunate.
601 In an ideal world, it would have been better if it consistently
602 used only one and not the other, and we would have picked en_US
603 (if you wish to correct the English of some of the existing
604 documentation, please see the documentation-related advice in the
605 Documentation/SubmittingPatches file).
607 In order to ensure the documentation is inclusive, avoid assuming
608 that an unspecified example person is male or female, and think
609 twice before using "he", "him", "she", or "her". Here are some
610 tips to avoid use of gendered pronouns:
612 - Prefer succinctness and matter-of-factly describing functionality
613 in the abstract. E.g.
615 --short:: Emit output in the short-format.
617 and avoid something like these overly verbose alternatives:
619 --short:: Use this to emit output in the short-format.
620 --short:: You can use this to get output in the short-format.
621 --short:: A user who prefers shorter output could....
622 --short:: Should a person and/or program want shorter output, he
625 This practice often eliminates the need to involve human actors in
626 your description, but it is a good practice regardless of the
627 avoidance of gendered pronouns.
629 - When it becomes awkward to stick to this style, prefer "you" when
630 addressing the hypothetical user, and possibly "we" when
631 discussing how the program might react to the user. E.g.
633 You can use this option instead of --xyz, but we might remove
634 support for it in future versions.
636 while keeping in mind that you can probably be less verbose, e.g.
638 Use this instead of --xyz. This option might be removed in future
641 - If you still need to refer to an example person that is
642 third-person singular, you may resort to "singular they" to avoid
643 "he/she/him/her", e.g.
645 A contributor asks their upstream to pull from them.
647 Note that this sounds ungrammatical and unnatural to those who
648 learned that "they" is only used for third-person plural, e.g.
649 those who learn English as a second language in some parts of the
652 Every user-visible change should be reflected in the documentation.
653 The same general rule as for code applies -- imitate the existing
656 A few commented examples follow to provide reference when writing or
657 modifying command usage strings and synopsis sections in the manual
660 Placeholders are spelled in lowercase and enclosed in angle brackets:
665 If a placeholder has multiple words, they are separated by dashes:
667 --template=<template-directory>
669 Possibility of multiple occurrences is indicated by three dots:
671 (One or more of <file>.)
673 Optional parts are enclosed in square brackets:
675 (Zero or more of <file>.)
678 (Option with an optional argument. Note that the "=" is inside the
682 (Zero or more of <patch>. Note that the dots are inside, not
683 outside the brackets.)
685 Multiple alternatives are indicated with vertical bars:
689 Use spacing around "|" token(s), but not immediately after opening or
690 before closing a [] or () pair:
694 Don't use spacing around "|" tokens when they're used to separate the
695 alternate arguments of an option:
696 Do: --track[=(direct|inherit)]
697 Don't: --track[=(direct | inherit)]
699 Parentheses are used for grouping:
700 [(<rev> | <range>)...]
701 (Any number of either <rev> or <range>. Parens are needed to make
702 it clear that "..." pertains to both <rev> and <range>.)
705 (Any number of option -p, each with one <parent> argument.)
707 git remote set-head <name> (-a | -d | <branch>)
708 (One and only one of "-a", "-d" or "<branch>" _must_ (no square
709 brackets) be provided.)
711 And a somewhat more contrived example:
712 --diff-filter=[(A|C|D|M|R|T|U|X|B)...[*]]
713 Here "=" is outside the brackets, because "--diff-filter=" is a
714 valid usage. "*" has its own pair of brackets, because it can
715 (optionally) be specified only when one or more of the letters is
719 Use 'git' (all lowercase) when talking about commands i.e. something
720 the user would type into a shell and use 'Git' (uppercase first letter)
721 when talking about the version control system and its properties.
723 A few commented examples follow to provide reference when writing or
724 modifying paragraphs or option/command explanations that contain options
727 Literal examples (e.g. use of command-line options, command names,
728 branch names, URLs, pathnames (files and directories), configuration and
729 environment variables) must be typeset in monospace (i.e. wrapped with
734 `http://git.example.com`
739 An environment variable must be prefixed with "$" only when referring to its
740 value and not when referring to the variable itself, in this case there is
741 nothing to add except the backticks:
742 `GIT_DIR` is specified
743 `$GIT_DIR/hooks/pre-receive`
745 Word phrases enclosed in `backtick characters` are rendered literally
746 and will not be further expanded. The use of `backticks` to achieve the
747 previous rule means that literal examples should not use AsciiDoc
754 If some place in the documentation needs to typeset a command usage
755 example with inline substitutions, it is fine to use +monospaced and
756 inline substituted text+ instead of `monospaced literal text`, and with
757 the former, the part that should not get substituted must be