Merge branch 'lp/typofixes' into maint

Typofixes.

* lp/typofixes:
  typofix: assorted typofixes in comments, documentation and messages
This commit is contained in:
Junio C Hamano 2016-05-26 13:17:21 -07:00
Родитель 1f62b9256d 832c0e5e63
Коммит d07211b5fa
12 изменённых файлов: 14 добавлений и 14 удалений

Просмотреть файл

@ -526,7 +526,7 @@ Push Certificate
A push certificate begins with a set of header lines. After the A push certificate begins with a set of header lines. After the
header and an empty line, the protocol commands follow, one per header and an empty line, the protocol commands follow, one per
line. Note that the the trailing LF in push-cert PKT-LINEs is _not_ line. Note that the trailing LF in push-cert PKT-LINEs is _not_
optional; it must be present. optional; it must be present.
Currently, the following header fields are defined: Currently, the following header fields are defined:

Просмотреть файл

@ -168,7 +168,7 @@ static int command_loop(const char *child)
size_t i; size_t i;
if (!fgets(buffer, MAXCOMMAND - 1, stdin)) { if (!fgets(buffer, MAXCOMMAND - 1, stdin)) {
if (ferror(stdin)) if (ferror(stdin))
die("Comammand input error"); die("Command input error");
exit(0); exit(0);
} }
/* Strip end of line characters. */ /* Strip end of line characters. */

Просмотреть файл

@ -147,7 +147,7 @@ struct dirent_prec_psx *precompose_utf8_readdir(PREC_DIR *prec_dir)
if (errno || inleft) { if (errno || inleft) {
/* /*
* iconv() failed and errno could be E2BIG, EILSEQ, EINVAL, EBADF * iconv() failed and errno could be E2BIG, EILSEQ, EINVAL, EBADF
* MacOS X avoids illegal byte sequemces. * MacOS X avoids illegal byte sequences.
* If they occur on a mounted drive (e.g. NFS) it is not worth to * If they occur on a mounted drive (e.g. NFS) it is not worth to
* die() for that, but rather let the user see the original name * die() for that, but rather let the user see the original name
*/ */

Просмотреть файл

@ -1156,7 +1156,7 @@ sub prepDirForOutput
# FUTURE: This would more accurately emulate CVS by sending # FUTURE: This would more accurately emulate CVS by sending
# another copy of sticky after processing the files in that # another copy of sticky after processing the files in that
# directory. Or intermediate: perhaps send all sticky's for # directory. Or intermediate: perhaps send all sticky's for
# $seendirs after after processing all files. # $seendirs after processing all files.
} }
# update \n # update \n
@ -2824,7 +2824,7 @@ sub statecleanup
} }
# Return working directory CVS revision "1.X" out # Return working directory CVS revision "1.X" out
# of the the working directory "entries" state, for the given filename. # of the working directory "entries" state, for the given filename.
# This is prefixed with a dash if the file is scheduled for removal # This is prefixed with a dash if the file is scheduled for removal
# when it is committed. # when it is committed.
sub revparse sub revparse
@ -2935,7 +2935,7 @@ sub filecleanup
return $filename; return $filename;
} }
# Remove prependdir from the path, so that is is relative to the directory # Remove prependdir from the path, so that it is relative to the directory
# the CVS client was started from, rather than the top of the project. # the CVS client was started from, rather than the top of the project.
# Essentially the inverse of filecleanup(). # Essentially the inverse of filecleanup().
sub remove_prependdir sub remove_prependdir

2
path.c
Просмотреть файл

@ -134,7 +134,7 @@ static struct common_dir common_list[] = {
* definite * definite
* definition * definition
* *
* The trie would look look like: * The trie would look like:
* root: len = 0, children a and d non-NULL, value = NULL. * root: len = 0, children a and d non-NULL, value = NULL.
* a: len = 2, contents = bc, value = (data for "abc") * a: len = 2, contents = bc, value = (data for "abc")
* d: len = 2, contents = ef, children i non-NULL, value = (data for "def") * d: len = 2, contents = ef, children i non-NULL, value = (data for "def")

Просмотреть файл

@ -393,7 +393,7 @@ sub command_close_pipe {
Execute the given C<COMMAND> in the same way as command_output_pipe() Execute the given C<COMMAND> in the same way as command_output_pipe()
does but return both an input pipe filehandle and an output pipe filehandle. does but return both an input pipe filehandle and an output pipe filehandle.
The function will return return C<($pid, $pipe_in, $pipe_out, $ctx)>. The function will return C<($pid, $pipe_in, $pipe_out, $ctx)>.
See C<command_close_bidi_pipe()> for details. See C<command_close_bidi_pipe()> for details.
=cut =cut

Просмотреть файл

@ -60,7 +60,7 @@ static void mark_base_index_entries(struct index_state *base)
* To keep track of the shared entries between * To keep track of the shared entries between
* istate->base->cache[] and istate->cache[], base entry * istate->base->cache[] and istate->cache[], base entry
* position is stored in each base entry. All positions start * position is stored in each base entry. All positions start
* from 1 instead of 0, which is resrved to say "this is a new * from 1 instead of 0, which is reserved to say "this is a new
* entry". * entry".
*/ */
for (i = 0; i < base->cache_nr; i++) for (i = 0; i < base->cache_nr; i++)

Просмотреть файл

@ -98,7 +98,7 @@ check_sub_test_lib_test () {
} }
check_sub_test_lib_test_err () { check_sub_test_lib_test_err () {
name="$1" # stdin is the expected output output from the test name="$1" # stdin is the expected output from the test
# expected error output is in descriptior 3 # expected error output is in descriptior 3
( (
cd "$name" && cd "$name" &&

Просмотреть файл

@ -1152,7 +1152,7 @@ static void udt_close_if_finished(struct unidirectional_transfer *t)
} }
/* /*
* Tries to read read data from source into buffer. If buffer is full, * Tries to read data from source into buffer. If buffer is full,
* no data is read. Returns 0 on success, -1 on error. * no data is read. Returns 0 on success, -1 on error.
*/ */
static int udt_do_read(struct unidirectional_transfer *t) static int udt_do_read(struct unidirectional_transfer *t)

2
utf8.h
Просмотреть файл

@ -48,7 +48,7 @@ static inline char *reencode_string(const char *in,
int mbs_chrlen(const char **text, size_t *remainder_p, const char *encoding); int mbs_chrlen(const char **text, size_t *remainder_p, const char *encoding);
/* /*
* Returns true if the the path would match ".git" after HFS case-folding. * Returns true if the path would match ".git" after HFS case-folding.
* The path should be NUL-terminated, but we will match variants of both ".git\0" * The path should be NUL-terminated, but we will match variants of both ".git\0"
* and ".git/..." (but _not_ ".../.git"). This makes it suitable for both fsck * and ".git/..." (but _not_ ".../.git"). This makes it suitable for both fsck
* and verify_path(). * and verify_path().

Просмотреть файл

@ -136,7 +136,7 @@ static int dowild(const uchar *p, const uchar *text, unsigned int flags)
/* /*
* Try to advance faster when an asterisk is * Try to advance faster when an asterisk is
* followed by a literal. We know in this case * followed by a literal. We know in this case
* that the the string before the literal * that the string before the literal
* must belong to "*". * must belong to "*".
* If match_slash is false, do not look past * If match_slash is false, do not look past
* the first slash as it cannot belong to '*'. * the first slash as it cannot belong to '*'.

Просмотреть файл

@ -18,7 +18,7 @@ void free_worktrees(struct worktree **worktrees)
/* /*
* read 'path_to_ref' into 'ref'. Also if is_detached is not NULL, * read 'path_to_ref' into 'ref'. Also if is_detached is not NULL,
* set is_detached to 1 (0) if the ref is detatched (is not detached). * set is_detached to 1 (0) if the ref is detached (is not detached).
* *
* $GIT_COMMON_DIR/$symref (e.g. HEAD) is practically outside $GIT_DIR so * $GIT_COMMON_DIR/$symref (e.g. HEAD) is practically outside $GIT_DIR so
* for linked worktrees, `resolve_ref_unsafe()` won't work (it uses * for linked worktrees, `resolve_ref_unsafe()` won't work (it uses