kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'ob/typofixes' 

* ob/typofixes:
  typofix: in-code comments
  typofix: documentation
  typofix: release notes
maint
Junio C Hamano 2013-07-24 19:23:00 -07:00
parent 4274cdf44a 749f763dbb
commit 0def7126fd
22 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/RelNotes/1.7.10.1.txt
View File

@ -14,7 +14,7 @@ Fixes since v1.7.10
not exclude them and tried to apply funny patches only to fail.

* "git blame" started missing quite a few changes from the origin
since we stopped using the diff minimalization by default in v1.7.2
since we stopped using the diff minimization by default in v1.7.2
era.

* When PATH contains an unreadable directory, alias expansion code

2
Documentation/RelNotes/1.7.5.4.txt
View File

@ -5,7 +5,7 @@ Fixes since v1.7.5.3
--------------------

* The single-key mode of "git add -p" was easily fooled into thinking
that it was told to add everthing ('a') when up-arrow was pressed by
that it was told to add everything ('a') when up-arrow was pressed by
mistake.

* Setting a git command that uses custom configuration via "-c var=val"

4
Documentation/RelNotes/1.7.8.2.txt
View File

@ -12,11 +12,11 @@ Fixes since v1.7.8.1
* The configuration file parser used for sizes (e.g. bigFileThreshold)
did not correctly interpret 'g' suffix.

* The replacement implemention for snprintf used on platforms with
* The replacement implementation for snprintf used on platforms with
native snprintf that is broken did not use va_copy correctly.

* LF-to-CRLF streaming filter replaced all LF with CRLF, which might
be techinically correct but not friendly to people who are trying
be technically correct but not friendly to people who are trying
to recover from earlier mistakes of using CRLF in the repository
data in the first place. It now refrains from doing so for LF that
follows a CR.

4
Documentation/RelNotes/1.7.8.txt
View File

@ -9,7 +9,7 @@ Updates since v1.7.7
* Updates to bash completion scripts.

* The build procedure has been taught to take advantage of computed
dependency automatically when the complier supports it.
dependency automatically when the compiler supports it.

* The date parser now accepts timezone designators that lack minutes
part and also has a colon between "hh:mm".
@ -31,7 +31,7 @@ Updates since v1.7.7
* Variants of "git cherry-pick" and "git revert" that take multiple
commits learned to "--continue" and "--abort".

* "git daemon" gives more human readble error messages to clients
* "git daemon" gives more human readable error messages to clients
using ERR packets when appropriate.

* Errors at the network layer is logged by "git daemon".

2
Documentation/RelNotes/1.8.2.1.txt
View File

@ -49,7 +49,7 @@ Fixes since v1.8.2
common prefix and suffix between the two filenames overlapped.

* "git submodule update", when recursed into sub-submodules, did not
acccumulate the prefix paths.
accumulate the prefix paths.

* "git am $maildir/" applied messages in an unexpected order; sort
filenames read from the maildir/ in a way that is more likely to

2
Documentation/RelNotes/1.8.2.2.txt
View File

@ -58,4 +58,4 @@ Fixes since v1.8.2.1
conflicts have been applied.

* "git bundle" did not like a bundle created using a commit without
any message as its one of the prerequistes.
any message as its one of the prerequisites.

2
Documentation/git-bisect-lk2009.txt
View File

@ -1320,7 +1320,7 @@ So git bisect is unconditional goodness - and feel free to quote that
;-)
_____________

Acknowledgements
Acknowledgments
----------------

Many thanks to Junio Hamano for his help in reviewing this paper, for

2
Documentation/git-rev-parse.txt
View File

@ -83,7 +83,7 @@ eval "set -- $(git rev-parse --sq --prefix "$prefix" "$@")"
+
If you want to make sure that the output actually names an object in
your object database and/or can be used as a specific type of object
you require, you can add "^{type}" peeling operator to the parmeter.
you require, you can add "^{type}" peeling operator to the parameter.
For example, `git rev-parse "$VAR^{commit}"` will make sure `$VAR`
names an existing object that is a commit-ish (i.e. a commit, or an
annotated tag that points at a commit). To make sure that `$VAR`

2
Documentation/gitweb.txt
View File

@ -504,7 +504,7 @@ repositories, you can configure Apache like this:

The above configuration expects your public repositories to live under
'/pub/git' and will serve them as `http://git.domain.org/dir-under-pub-git`,
both as cloneable Git URL and as browseable gitweb interface. If you then
both as clonable Git URL and as browseable gitweb interface. If you then
start your linkgit:git-daemon[1] with `--base-path=/pub/git --export-all`
then you can even use the `git://` URL with exactly the same path.


2
Documentation/howto/revert-branch-rebase.txt
View File

@ -12,7 +12,7 @@ How to revert an existing commit
================================

One of the changes I pulled into the 'master' branch turns out to
break building Git with GCC 2.95. While they were well intentioned
break building Git with GCC 2.95. While they were well-intentioned
portability fixes, keeping things working with gcc-2.95 was also
important. Here is what I did to revert the change in the 'master'
branch and to adjust the 'pu' branch, using core Git tools and

2
Documentation/rev-list-options.txt
View File

@ -369,7 +369,7 @@ each merge. The commits are:
* `E` changes `quux` to "xyzzy", and its merge `P` combines the
strings to "quux xyzzy". `P` is TREESAME to `O`, but not to `E`.

* `X` is an indpendent root commit that added a new file `side`, and `Y`
* `X` is an independent root commit that added a new file `side`, and `Y`
modified it. `Y` is TREESAME to `X`. Its merge `Q` added `side` to `P`, and
`Q` is TREESAME to `P`, but not to `Y`.


2
Documentation/technical/index-format.txt
View File

@ -175,7 +175,7 @@ Git index format

A conflict is represented in the index as a set of higher stage entries.
When a conflict is resolved (e.g. with "git add path"), these higher
stage entries will be removed and a stage-0 entry with proper resoluton
stage entries will be removed and a stage-0 entry with proper resolution
is added.

When these higher stage entries are removed, they are saved in the

2
Documentation/technical/racy-git.txt
View File

@ -46,7 +46,7 @@ because in-core timestamps can have finer granularity than
on-disk timestamps, resulting in meaningless changes when an
inode is evicted from the inode cache. See commit 8ce13b0
of git://git.kernel.org/pub/scm/linux/kernel/git/tglx/history.git
([PATCH] Sync in core time granuality with filesystems,
([PATCH] Sync in core time granularity with filesystems,
2005-01-04).

Racy Git

2
compat/nedmalloc/Readme.txt
View File

@ -97,7 +97,7 @@ Chew for reporting this.

v1.04alpha_svn915 7th October 2006:
* Fixed failure to unlock thread cache list if allocating a new list failed.
Thanks to Dmitry Chichkov for reporting this. Futher thanks to Aleksey Sanin.
Thanks to Dmitry Chichkov for reporting this. Further thanks to Aleksey Sanin.
* Fixed realloc(0, <size>) segfaulting. Thanks to Dmitry Chichkov for
reporting this.
* Made config defines #ifndef so they can be overridden by the build system.

4
compat/nedmalloc/malloc.c.h
View File

@ -3602,8 +3602,8 @@ static void internal_malloc_stats(mstate m) {
and choose its bk node as its replacement.
2. If x was the last node of its size, but not a leaf node, it must
be replaced with a leaf node (not merely one with an open left or
right), to make sure that lefts and rights of descendents
correspond properly to bit masks. We use the rightmost descendent
right), to make sure that lefts and rights of descendants
correspond properly to bit masks. We use the rightmost descendant
of x. We could use any other leaf, but this is easy to locate and
tends to counteract removal of leftmosts elsewhere, and so keeps
paths shorter than minimally guaranteed. This doesn't loop much

16
compat/regex/regcomp.c
View File

@ -2617,7 +2617,7 @@ parse_dup_op (bin_tree_t *elem, re_string_t *regexp, re_dfa_t *dfa,
Build the range expression which starts from START_ELEM, and ends
at END_ELEM. The result are written to MBCSET and SBCSET.
RANGE_ALLOC is the allocated size of mbcset->range_starts, and
mbcset->range_ends, is a pointer argument sinse we may
mbcset->range_ends, is a pointer argument since we may
update it. */

static reg_errcode_t
@ -2788,7 +2788,7 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token,
const int32_t *symb_table;
const unsigned char *extra;

/* Local function for parse_bracket_exp used in _LIBC environement.
/* Local function for parse_bracket_exp used in _LIBC environment.
Seek the collating symbol entry correspondings to NAME.
Return the index of the symbol in the SYMB_TABLE. */

@ -2892,11 +2892,11 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token,
return UINT_MAX;
}

/* Local function for parse_bracket_exp used in _LIBC environement.
/* Local function for parse_bracket_exp used in _LIBC environment.
Build the range expression which starts from START_ELEM, and ends
at END_ELEM. The result are written to MBCSET and SBCSET.
RANGE_ALLOC is the allocated size of mbcset->range_starts, and
mbcset->range_ends, is a pointer argument sinse we may
mbcset->range_ends, is a pointer argument since we may
update it. */

auto inline reg_errcode_t
@ -2976,11 +2976,11 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token,
return REG_NOERROR;
}

/* Local function for parse_bracket_exp used in _LIBC environement.
/* Local function for parse_bracket_exp used in _LIBC environment.
Build the collating element which is represented by NAME.
The result are written to MBCSET and SBCSET.
COLL_SYM_ALLOC is the allocated size of mbcset->coll_sym, is a
pointer argument sinse we may update it. */
pointer argument since we may update it. */

auto inline reg_errcode_t
__attribute ((always_inline))
@ -3419,7 +3419,7 @@ parse_bracket_symbol (bracket_elem_t *elem, re_string_t *regexp,
Build the equivalence class which is represented by NAME.
The result are written to MBCSET and SBCSET.
EQUIV_CLASS_ALLOC is the allocated size of mbcset->equiv_classes,
is a pointer argument sinse we may update it. */
is a pointer argument since we may update it. */

static reg_errcode_t
#ifdef RE_ENABLE_I18N
@ -3515,7 +3515,7 @@ build_equiv_class (bitset_t sbcset, const unsigned char *name)
Build the character class which is represented by NAME.
The result are written to MBCSET and SBCSET.
CHAR_CLASS_ALLOC is the allocated size of mbcset->char_classes,
is a pointer argument sinse we may update it. */
is a pointer argument since we may update it. */

static reg_errcode_t
#ifdef RE_ENABLE_I18N

6
compat/regex/regexec.c
View File

@ -455,7 +455,7 @@ re_search_stub (struct re_pattern_buffer *bufp,

rval = 0;

/* I hope we needn't fill ther regs with -1's when no match was found. */
/* I hope we needn't fill their regs with -1's when no match was found. */
if (result != REG_NOERROR)
rval = -1;
else if (regs != NULL)
@ -1071,7 +1071,7 @@ acquire_init_state_context (reg_errcode_t *err, const re_match_context_t *mctx,
FL_LONGEST_MATCH means we want the POSIX longest matching.
If P_MATCH_FIRST is not NULL, and the match fails, it is set to the
next place where we may want to try matching.
Note that the matcher assume that the maching starts from the current
Note that the matcher assume that the matching starts from the current
index of the buffer. */

static int
@ -2239,7 +2239,7 @@ sift_states_iter_mb (const re_match_context_t *mctx, re_sift_context_t *sctx,
dfa->nexts[node_idx]))
/* The node can't accept the `multi byte', or the
destination was already thrown away, then the node
could't accept the current input `multi byte'. */
couldn't accept the current input `multi byte'. */
naccepted = 0;
/* Otherwise, it is sure that the node could accept
`naccepted' bytes input. */

2
convert.c
View File

@ -835,7 +835,7 @@ int renormalize_buffer(const char *path, const char *src, size_t len, struct str

/*****************************************************************
*
* Streaming converison support
* Streaming conversion support
*
*****************************************************************/


2
convert.h
View File

@ -48,7 +48,7 @@ static inline int would_convert_to_git(const char *path, const char *src,

/*****************************************************************
*
* Streaming converison support
* Streaming conversion support
*
*****************************************************************/


2
diff.c
View File

@ -4464,7 +4464,7 @@ void diff_flush(struct diff_options *options)
DIFF_OPT_TST(options, DIFF_FROM_CONTENTS)) {
/*
* run diff_flush_patch for the exit status. setting
* options->file to /dev/null should be safe, becaue we
* options->file to /dev/null should be safe, because we
* aren't supposed to produce any output anyway.
*/
if (options->close_file)

10
kwset.c
View File

@ -65,7 +65,7 @@ struct trie
struct trie *fail; /* Aho-Corasick failure function. */
int depth; /* Depth of this node from the root. */
int shift; /* Shift function for search failures. */
int maxshift; /* Max shift of self and descendents. */
int maxshift; /* Max shift of self and descendants. */
};

/* Structure returned opaquely to the caller, containing everything. */
@ -308,7 +308,7 @@ treefails (register struct tree const *tree, struct trie const *fail,
treefails(tree->rlink, fail, recourse);

/* Find, in the chain of fails going back to the root, the first
node that has a descendent on the current label. */
node that has a descendant on the current label. */
while (fail)
{
link = fail->links;
@ -426,13 +426,13 @@ kwsprep (kwset_t kws)
computing the delta table, failure function, and shift function. */
for (curr = last = kwset->trie; curr; curr = curr->next)
{
/* Enqueue the immediate descendents in the level order queue. */
/* Enqueue the immediate descendants in the level order queue. */
enqueue(curr->links, &last);

curr->shift = kwset->mind;
curr->maxshift = kwset->mind;

/* Update the delta table for the descendents of this node. */
/* Update the delta table for the descendants of this node. */
treedelta(curr->links, curr->depth, delta);

/* Compute the failure function for the descendants of this node. */
@ -450,7 +450,7 @@ kwsprep (kwset_t kws)
fail->shift = curr->depth - fail->depth;

/* If the current node is accepting then the shift at the
fail and its descendents should be no larger than the
fail and its descendants should be no larger than the
difference of their depths. */
if (curr->accepting && fail->maxshift > curr->depth - fail->depth)
fail->maxshift = curr->depth - fail->depth;

2
sha1_name.c
View File

@ -52,7 +52,7 @@ static void update_candidates(struct disambiguate_state *ds, const unsigned char
}

if (!ds->candidate_ok) {
/* discard the candidate; we know it does not satisify fn */
/* discard the candidate; we know it does not satisfy fn */
hashcpy(ds->candidate, current);
ds->candidate_checked = 0;
return;