+2 -2

apply.c

··· 4183 4183 old_name = slash_old + 1; 4184 4184 new_name = slash_new + 1; 4185 4185 } 4186 4186 - /* p->old_name thru old_name is the common prefix, and old_name and new_name 4187 4187 - * through the end of names are renames 4186 4186 + /* p->old_name through old_name is the common prefix, and old_name and 4187 4187 + * new_name through the end of names are renames 4188 4188 */ 4189 4189 if (old_name != p->old_name) 4190 4190 printf(" %s %.*s{%s => %s} (%d%%)\n", renamecopy,

+1 -1

builtin/fetch.c

··· 1400 1400 1401 1401 /* 1402 1402 * We're setting the upstream configuration for the 1403 1403 - * current branch. The relevent upstream is the 1403 1403 + * current branch. The relevant upstream is the 1404 1404 * fetched branch that is meant to be merged with the 1405 1405 * current one, i.e. the one fetched to FETCH_HEAD. 1406 1406 *

+2 -2

builtin/gc.c

··· 458 458 /* 459 459 * Returns 0 if there was no previous error and gc can proceed, 1 if 460 460 * gc should not proceed due to an error in the last run. Prints a 461 461 - * message and returns -1 if an error occured while reading gc.log 461 461 + * message and returns -1 if an error occurred while reading gc.log 462 462 */ 463 463 static int report_last_gc_error(void) 464 464 { ··· 601 601 if (detach_auto) { 602 602 int ret = report_last_gc_error(); 603 603 if (ret < 0) 604 604 - /* an I/O error occured, already reported */ 604 604 + /* an I/O error occurred, already reported */ 605 605 exit(128); 606 606 if (ret == 1) 607 607 /* Last gc --auto failed. Skip this one. */

+1 -1

builtin/pack-objects.c

··· 163 163 delta_buf = diff_delta(base_buf, base_size, 164 164 buf, size, &delta_size, 0); 165 165 /* 166 166 - * We succesfully computed this delta once but dropped it for 166 166 + * We successfully computed this delta once but dropped it for 167 167 * memory reasons. Something is very wrong if this time we 168 168 * recompute and create a different delta. 169 169 */

+1 -1

commit-graph.c

··· 461 461 /* 462 462 * Return 1 if commit_graph is non-NULL, and 0 otherwise. 463 463 * 464 464 - * On the first invocation, this function attemps to load the commit 464 464 + * On the first invocation, this function attempts to load the commit 465 465 * graph if the_repository is configured to have one. 466 466 */ 467 467 static int prepare_commit_graph(struct repository *r)

+1 -1

commit.h

··· 132 132 #endif 133 133 134 134 /* 135 135 - * Tell the commit subsytem that we are done with a particular commit buffer. 135 135 + * Tell the commit subsystem that we are done with a particular commit buffer. 136 136 * The commit and buffer should be the input and return value, respectively, 137 137 * from an earlier call to get_commit_buffer. The buffer may or may not be 138 138 * freed by this call; callers should not access the memory afterwards.

+1 -1

compat/mingw.h

··· 558 558 559 559 /* 560 560 * A critical section used in the implementation of the spawn 561 561 - * functions (mingw_spawnv[p]e()) and waitpid(). Intialised in 561 561 + * functions (mingw_spawnv[p]e()) and waitpid(). Initialised in 562 562 * the replacement main() macro below. 563 563 */ 564 564 extern CRITICAL_SECTION pinfo_cs;

+1 -1

compat/vcbuild/find_vs_env.bat

··· 18 18 REM attempts to do that. 19 19 REM ================================================================ 20 20 REM This BAT file starts in a plain (non-developer) command prompt, 21 21 - REM searches for the "best" commmand prompt setup script, installs 21 21 + REM searches for the "best" command prompt setup script, installs 22 22 REM it into the current CMD process, and exports the various MSVC 23 23 REM environment variables for use by MAKE. 24 24 REM

+1 -1

configure.ac

··· 85 85 86 86 # GIT_PARSE_WITH_SET_MAKE_VAR(WITHNAME, VAR, HELP_TEXT) 87 87 # ----------------------------------------------------- 88 88 - # Set VAR to the value specied by --with-WITHNAME. 88 88 + # Set VAR to the value specified by --with-WITHNAME. 89 89 # No verification of arguments is performed, but warnings are issued 90 90 # if either 'yes' or 'no' is specified. 91 91 # HELP_TEXT is presented when --help is called.

+1 -1

contrib/coccinelle/commit.cocci

··· 20 20 + set_commit_tree(c, s) 21 21 ...>} 22 22 23 23 - // These excluded functions must access c->maybe_tree direcly. 23 23 + // These excluded functions must access c->maybe_tree directly. 24 24 // Note that if c->maybe_tree is written somewhere outside of these 25 25 // functions, then the recommended transformation will be bogus with 26 26 // repo_get_commit_tree() on the LHS.

+2 -2

contrib/completion/git-completion.bash

··· 550 550 esc_idx, 1) 551 551 } else if (esc == "n") { 552 552 # Uh-oh, a newline character. 553 553 - # We cant reliably put a pathname 553 553 + # We cannot reliably put a pathname 554 554 # containing a newline into COMPREPLY, 555 555 # and the newline would create a mess. 556 556 # Skip this path. ··· 565 565 } 566 566 } 567 567 # Drop closing double quote, if there is one. 568 568 - # (There isnt any if this is a directory, as it was 568 568 + # (There is not any if this is a directory, as it was 569 569 # already stripped with the trailing path components.) 570 570 if (substr(p, length(p), 1) == "\"") 571 571 out = out substr(p, 1, length(p) - 1)

+1 -1

contrib/hooks/post-receive-email

··· 329 329 # 330 330 # git rev-parse --not --all | grep -v $(git rev-parse $refname) 331 331 # 332 332 - # Get's us to something pretty safe (apart from the small time 332 332 + # Gets us to something pretty safe (apart from the small time 333 333 # between refname being read, and git rev-parse running - for that, 334 334 # I give up) 335 335 #

+1 -1

convert.c

··· 418 418 if (!dst) { 419 419 /* 420 420 * We could add the blob "as-is" to Git. However, on checkout 421 421 - * we would try to reencode to the original encoding. This 421 421 + * we would try to re-encode to the original encoding. This 422 422 * would fail and we would leave the user with a messed-up 423 423 * working tree. Let's try to avoid this by screaming loud. 424 424 */

+2 -2

daemon.c

··· 598 598 * Read the host as supplied by the client connection. 599 599 * 600 600 * Returns a pointer to the character after the NUL byte terminating the host 601 601 - * arguemnt, or 'extra_args' if there is no host arguemnt. 601 601 + * argument, or 'extra_args' if there is no host argument. 602 602 */ 603 603 static char *parse_host_arg(struct hostinfo *hi, char *extra_args, int buflen) 604 604 { ··· 652 652 * service that will be run. 653 653 * 654 654 * If there ends up being a particular arg in the future that 655 655 - * git-daemon needs to parse specificly (like the 'host' arg) 655 655 + * git-daemon needs to parse specifically (like the 'host' arg) 656 656 * then it can be parsed here and not added to 'git_protocol'. 657 657 */ 658 658 if (*arg) {

+2 -2

diff.c

··· 2551 2551 /* 2552 2552 * make sure that at least one '-' or '+' is printed if 2553 2553 * there is any change to this path. The easiest way is to 2554 2554 - * scale linearly as if the alloted width is one column shorter 2554 2554 + * scale linearly as if the allotted width is one column shorter 2555 2555 * than it is, and then add 1 to the result. 2556 2556 */ 2557 2557 return 1 + (it * (width - 1) / max_change); ··· 3196 3196 for (cnt = 1; cnt < marker_size; cnt++) 3197 3197 if (line[cnt] != firstchar) 3198 3198 return 0; 3199 3199 - /* line[1] thru line[marker_size-1] are same as firstchar */ 3199 3199 + /* line[1] through line[marker_size-1] are same as firstchar */ 3200 3200 if (len < marker_size + 1 || !isspace(line[marker_size])) 3201 3201 return 0; 3202 3202 return 1;

+1 -1

dir.c

··· 2489 2489 * wanted anyway 2490 2490 */ 2491 2491 continue; 2492 2492 - /* fall thru */ 2492 2492 + /* fall through */ 2493 2493 } else if (S_ISDIR(st.st_mode)) { 2494 2494 if (!remove_dir_recurse(path, flag, &kept_down)) 2495 2495 continue; /* happy */

+1 -1

git-send-email.perl

··· 1228 1228 # domain name that corresponds the IP address in the HELO/EHLO 1229 1229 # handshake. This is used to verify the connection and prevent 1230 1230 # spammers from trying to hide their identity. If the DNS and IP don't 1231 1231 - # match, the receiveing MTA may deny the connection. 1231 1231 + # match, the receiving MTA may deny the connection. 1232 1232 # 1233 1233 # Here is a deny example of Net::SMTP with the default "localhost.localdomain" 1234 1234 #

+9 -9

gitweb/gitweb.perl

··· 1657 1657 my $cntrl = shift; 1658 1658 my %opts = @_; 1659 1659 my %es = ( # character escape codes, aka escape sequences 1660 1660 - "\t" => '\t', # tab (HT) 1661 1661 - "\n" => '\n', # line feed (LF) 1662 1662 - "\r" => '\r', # carrige return (CR) 1663 1663 - "\f" => '\f', # form feed (FF) 1664 1664 - "\b" => '\b', # backspace (BS) 1665 1665 - "\a" => '\a', # alarm (bell) (BEL) 1666 1666 - "\e" => '\e', # escape (ESC) 1667 1667 - "\013" => '\v', # vertical tab (VT) 1668 1668 - "\000" => '\0', # nul character (NUL) 1660 1660 + "\t" => '\t', # tab (HT) 1661 1661 + "\n" => '\n', # line feed (LF) 1662 1662 + "\r" => '\r', # carriage return (CR) 1663 1663 + "\f" => '\f', # form feed (FF) 1664 1664 + "\b" => '\b', # backspace (BS) 1665 1665 + "\a" => '\a', # alarm (bell) (BEL) 1666 1666 + "\e" => '\e', # escape (ESC) 1667 1667 + "\013" => '\v', # vertical tab (VT) 1668 1668 + "\000" => '\0', # nul character (NUL) 1669 1669 ); 1670 1670 my $chr = ( (exists $es{$cntrl}) 1671 1671 ? $es{$cntrl}

+1 -1

hashmap.c

··· 51 51 } 52 52 53 53 /* 54 54 - * Incoporate another chunk of data into a memihash 54 54 + * Incorporate another chunk of data into a memihash 55 55 * computation. 56 56 */ 57 57 unsigned int memihash_cont(unsigned int hash_seed, const void *buf, size_t len)

+1 -1

hashmap.h

··· 502 502 } 503 503 504 504 /* 505 505 - * Re-enable item couting when adding/removing items. 505 505 + * Re-enable item counting when adding/removing items. 506 506 * If counting is currently disabled, it will force count them. 507 507 * It WILL NOT automatically rehash them. 508 508 */

+1 -1

name-hash.c

··· 138 138 139 139 /* 140 140 * Set a minimum number of cache_entries that we will handle per 141 141 - * thread and use that to decide how many threads to run (upto 141 141 + * thread and use that to decide how many threads to run (up to 142 142 * the number on the system). 143 143 * 144 144 * For guidance setting the lower per-thread bound, see:

+1 -1

parse-options.c

··· 623 623 * Scan and may produce a new option[] array, which should be used 624 624 * instead of the original 'options'. 625 625 * 626 626 - * Right now this is only used to preprocess and substitue 626 626 + * Right now this is only used to preprocess and substitute 627 627 * OPTION_ALIAS. 628 628 */ 629 629 static struct option *preprocess_options(struct parse_opt_ctx_t *ctx,

+1 -1

range-diff.h

··· 6 6 #define RANGE_DIFF_CREATION_FACTOR_DEFAULT 60 7 7 8 8 /* 9 9 - * Compare series of commmits in RANGE1 and RANGE2, and emit to the 9 9 + * Compare series of commits in RANGE1 and RANGE2, and emit to the 10 10 * standard output. NULL can be passed to DIFFOPT to use the built-in 11 11 * default. 12 12 */

+1 -1

read-cache.c

··· 1790 1790 const unsigned char *cp = (const unsigned char *)name; 1791 1791 size_t strip_len, previous_len; 1792 1792 1793 1793 - /* If we're at the begining of a block, ignore the previous name */ 1793 1793 + /* If we're at the beginning of a block, ignore the previous name */ 1794 1794 strip_len = decode_varint(&cp); 1795 1795 if (previous_ce) { 1796 1796 previous_len = previous_ce->ce_namelen;

+1 -1

refs/refs-internal.h

··· 262 262 * after calling ref_iterator_advance() again or calling 263 263 * ref_iterator_abort(), you must make a copy. When the iteration has 264 264 * been exhausted, ref_iterator_advance() releases any resources 265 265 - * assocated with the iteration, frees the ref_iterator object, and 265 265 + * associated with the iteration, frees the ref_iterator object, and 266 266 * returns ITER_DONE. If you want to abort the iteration early, call 267 267 * ref_iterator_abort(), which also frees the ref_iterator object and 268 268 * any associated resources. If there was an internal error advancing

+2 -2

repository.c

··· 200 200 201 201 if (repo_init(subrepo, gitdir.buf, worktree.buf)) { 202 202 /* 203 203 - * If initilization fails then it may be due to the submodule 203 203 + * If initialization fails then it may be due to the submodule 204 204 * not being populated in the superproject's worktree. Instead 205 205 - * we can try to initilize the submodule by finding it's gitdir 205 205 + * we can try to initialize the submodule by finding it's gitdir 206 206 * in the superproject's 'modules' directory. In this case the 207 207 * submodule would not have a worktree. 208 208 */

+1 -1

repository.h

··· 172 172 * be allocated if needed. 173 173 * 174 174 * Return the number of index entries in the populated index or a value less 175 175 - * than zero if an error occured. If the repository's index has already been 175 175 + * than zero if an error occurred. If the repository's index has already been 176 176 * populated then the number of entries will simply be returned. 177 177 */ 178 178 int repo_read_index(struct repository *repo);

+1 -1

rerere.c

··· 431 431 * and NUL concatenated together. 432 432 * 433 433 * Return 1 if conflict hunks are found, 0 if there are no conflict 434 434 - * hunks and -1 if an error occured. 434 434 + * hunks and -1 if an error occurred. 435 435 */ 436 436 static int handle_path(unsigned char *hash, struct rerere_io *io, int marker_size) 437 437 {

+3 -3

sequencer.c

··· 131 131 "rebase-merge/rewritten-pending") 132 132 133 133 /* 134 134 - * The path of the file containig the OID of the "squash onto" commit, i.e. 134 134 + * The path of the file containing the OID of the "squash onto" commit, i.e. 135 135 * the dummy commit used for `reset [new root]`. 136 136 */ 137 137 static GIT_PATH_FUNC(rebase_path_squash_onto, "rebase-merge/squash-onto") ··· 4644 4644 label_oid(oid, "branch-point", &state); 4645 4645 } 4646 4646 4647 4647 - /* Add HEAD as implict "tip of branch" */ 4647 4647 + /* Add HEAD as implicit "tip of branch" */ 4648 4648 if (!iter->next) 4649 4649 tips_tail = &commit_list_insert(iter->item, 4650 4650 tips_tail)->next; ··· 4826 4826 * are considered part of the pick, so we insert the commands *after* 4827 4827 * those chains if there are any. 4828 4828 * 4829 4829 - * As we insert the exec commands immediatly after rearranging 4829 4829 + * As we insert the exec commands immediately after rearranging 4830 4830 * any fixups and before the user edits the list, a fixup chain 4831 4831 * can never contain comments (any comments are empty picks that 4832 4832 * have been commented out because the user did not specify

+1 -1

server-info.c

··· 93 93 uic.old_fp = fopen_or_warn(path, "r"); 94 94 95 95 /* 96 96 - * uic_printf will compare incremental comparison aginst old_fp 96 96 + * uic_printf will compare incremental comparison against old_fp 97 97 * and mark uic as stale if needed 98 98 */ 99 99 ret = generate(&uic);

+1 -1

string-list.h

··· 179 179 180 180 /** 181 181 * Check if the given string is part of a sorted list. If it is part of the list, 182 182 - * return the coresponding string_list_item, NULL otherwise. 182 182 + * return the corresponding string_list_item, NULL otherwise. 183 183 */ 184 184 struct string_list_item *string_list_lookup(struct string_list *list, const char *string); 185 185

+1 -1

trace2/tr2_sid.c

··· 19 19 * "H<first_8_chars_of_sha1_of_hostname>" 20 20 * "Localhost" when no hostname. 21 21 * 22 22 - * where <process> is a 9 character string containing the least signifcant 22 22 + * where <process> is a 9 character string containing the least significant 23 23 * 32 bits in the process-id. 24 24 * "P<pid>" 25 25 * (This is an abribrary choice. On most systems pid_t is a 32 bit value,

+2 -2

unpack-trees.c

··· 275 275 } 276 276 277 277 /* 278 278 - * Preform the loading of the repository's gitmodules file. This function is 278 278 + * Perform the loading of the repository's gitmodules file. This function is 279 279 * used by 'check_update()' to perform loading of the gitmodules file in two 280 280 - * differnt situations: 280 280 + * different situations: 281 281 * (1) before removing entries from the working tree if the gitmodules file has 282 282 * been marked for removal. This situation is specified by 'state' == NULL. 283 283 * (2) before checking out entries to the working tree if the gitmodules file

+1 -1

url.c

··· 5 5 { 6 6 /* 7 7 * The set of valid URL schemes, as per STD66 (RFC3986) is 8 8 - * '[A-Za-z][A-Za-z0-9+.-]*'. But use sightly looser check 8 8 + * '[A-Za-z][A-Za-z0-9+.-]*'. But use slightly looser check 9 9 * of '[A-Za-z0-9][A-Za-z0-9+.-]*' because earlier version 10 10 * of check used '[A-Za-z0-9]+' so not to break any remote 11 11 * helpers.

+1 -1

xdiff-interface.h

··· 44 44 * Compare the strings l1 with l2 which are of size s1 and s2 respectively. 45 45 * Returns 1 if the strings are deemed equal, 0 otherwise. 46 46 * The `flags` given as XDF_WHITESPACE_FLAGS determine how white spaces 47 47 - * are treated for the comparision. 47 47 + * are treated for the comparison. 48 48 */ 49 49 int xdiff_compare_lines(const char *l1, long s1, 50 50 const char *l2, long s2, long flags);