Fix typos / spelling in comments
Signed-off-by: Mike Ralphson <mike@abacus.co.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Mike Ralphson committed
Apr 17, 2009 at 19:13 UTC
3ea3c215c02dc4a4e7d0881c25b2223540960797
20 files changed
+27
-27
builtin-checkout.c
+1
-1
@@ -178,7 +178,7 @@ static int checkout_merged(int pos, struct checkout *state)
178
/*
179
* NEEDSWORK:
180
* There is absolutely no reason to write this as a blob object
181
- * and create a phoney cache entry just to leak. This hack is
181
+ * and create a phony cache entry just to leak. This hack is
182
* primarily to get to the write_entry() machinery that massages
183
* the contents to work-tree format and writes out which only
184
* allows it for a cache entry. The code in write_entry() needs
builtin-ls-files.c
+1
-1
@@ -512,7 +512,7 @@ int cmd_ls_files(int argc, const char **argv, const char *prefix)
512
513
pathspec = get_pathspec(prefix, argv);
514
515
- /* be nice with submodule patsh ending in a slash */
515
+ /* be nice with submodule paths ending in a slash */
516
read_cache();
517
if (pathspec)
518
strip_trailing_slash_from_submodules();
builtin-pack-objects.c
+1
-1
@@ -293,7 +293,7 @@ static unsigned long write_object(struct sha1file *f,
293
die("unable to read %s", sha1_to_hex(entry->idx.sha1));
294
/*
295
* make sure no cached delta data remains from a
296
- * previous attempt before a pack split occured.
296
+ * previous attempt before a pack split occurred.
297
*/
298
free(entry->delta_data);
299
entry->delta_data = NULL;
builtin-reflog.c
+1
-1
@@ -243,7 +243,7 @@ static void mark_reachable(struct commit *commit, unsigned long expire_limit)
243
* We need to compute if commit on either side of an reflog
244
* entry is reachable from the tip of the ref for all entries.
245
* Mark commits that are reachable from the tip down to the
246
- * time threashold first; we know a commit marked thusly is
246
+ * time threshold first; we know a commit marked thusly is
247
* reachable from the tip without running in_merge_bases()
248
* at all.
249
*/
builtin-reset.c
+1
-1
@@ -228,7 +228,7 @@ int cmd_reset(int argc, const char **argv, const char *prefix)
228
}
229
/*
230
* Otherwise, argv[i] could be either <rev> or <paths> and
231
- * has to be unambigous.
231
+ * has to be unambiguous.
232
*/
233
else if (!get_sha1(argv[i], sha1)) {
234
/*
compat/cygwin.c
+1
-1
@@ -92,7 +92,7 @@ static int cygwin_stat(const char *path, struct stat *buf)
92
* Reading this option is not always possible immediately as git_dir may be
93
* not be set yet. So until it is set, use cygwin lstat/stat functions.
94
* However, if core.filemode is set, we must use the Cygwin posix
95
- * stat/lstat as the Windows stat fuctions do not determine posix filemode.
95
+ * stat/lstat as the Windows stat functions do not determine posix filemode.
96
*
97
* Note that git_cygwin_config() does NOT call git_default_config() and this
98
* is deliberate. Many commands read from config to establish initial
compat/fnmatch/fnmatch.c
+2
-2
@@ -39,7 +39,7 @@
39
# include <stdlib.h>
40
#endif
41
42
-/* For platform which support the ISO C amendement 1 functionality we
42
+/* For platform which support the ISO C amendment 1 functionality we
43
support user defined character classes. */
44
#if defined _LIBC || (defined HAVE_WCTYPE_H && defined HAVE_WCHAR_H)
45
/* Solaris 2.5 has a bug: <wchar.h> must be included before <wctype.h>. */
@@ -90,7 +90,7 @@
90
91
# if defined _LIBC || (defined HAVE_WCTYPE_H && defined HAVE_WCHAR_H)
92
/* The GNU C library provides support for user-defined character classes
93
- and the functions from ISO C amendement 1. */
93
+ and the functions from ISO C amendment 1. */
94
# ifdef CHARCLASS_NAME_MAX
95
# define CHAR_CLASS_MAX_LENGTH CHARCLASS_NAME_MAX
96
# else
compat/mingw.c
+1
-1
@@ -396,7 +396,7 @@ repeat:
396
* its own input data to become available. But since
397
* the process (pack-objects) is itself CPU intensive,
398
* it will happily pick up the time slice that we are
399
- * relinguishing here.
399
+ * relinquishing here.
400
*/
401
Sleep(0);
402
goto repeat;
compat/regex/regex.c
+2
-2
@@ -1043,7 +1043,7 @@ regex_compile (pattern, size, syntax, bufp)
1043
they can be reliably used as array indices. */
1044
register unsigned char c, c1;
1045
1046
- /* A random tempory spot in PATTERN. */
1046
+ /* A random temporary spot in PATTERN. */
1047
const char *p1;
1048
1049
/* Points to the end of the buffer, where we should append. */
@@ -1796,7 +1796,7 @@ regex_compile (pattern, size, syntax, bufp)
1796
we're all done, the pattern will look like:
1797
set_number_at <jump count> <upper bound>
1798
set_number_at <succeed_n count> <lower bound>
1799
- succeed_n <after jump addr> <succed_n count>
1799
+ succeed_n <after jump addr> <succeed_n count>
1800
<body of loop>
1801
jump_n <succeed_n addr> <jump count>
1802
(The upper bound and `jump_n' are omitted if
diffcore-rename.c
+1
-1
@@ -267,7 +267,7 @@ static int find_identical_files(struct file_similarity *src,
267
int score;
268
struct diff_filespec *source = p->filespec;
269
270
- /* False hash collission? */
270
+ /* False hash collision? */
271
if (hashcmp(source->sha1, target->sha1))
272
continue;
273
/* Non-regular files? If so, the modes must match! */
fast-import.c
+3
-3
@@ -76,7 +76,7 @@ Format of STDIN stream:
76
delim lf;
77
78
# note: declen indicates the length of binary_data in bytes.
79
- # declen does not include the lf preceeding the binary data.
79
+ # declen does not include the lf preceding the binary data.
80
#
81
exact_data ::= 'data' sp declen lf
82
binary_data;
@@ -134,7 +134,7 @@ Format of STDIN stream:
134
#
135
# In case it is not clear, the '#' that starts the comment
136
# must be the first character on that the line (an lf have
137
- # preceeded it).
137
+ # preceded it).
138
#
139
comment ::= '#' not_lf* lf;
140
not_lf ::= # Any byte that is not ASCII newline (LF);
@@ -953,7 +953,7 @@ static void end_packfile(void)
953
close(pack_data->pack_fd);
954
idx_name = keep_pack(create_index());
955
956
- /* Register the packfile with core git's machinary. */
956
+ /* Register the packfile with core git's machinery. */
957
new_p = add_packed_git(idx_name, strlen(idx_name), 1);
958
if (!new_p)
959
die("core git rejected index %s", idx_name);
fsck.h
+1
-1
@@ -23,7 +23,7 @@ int fsck_error_function(struct object *obj, int type, const char *fmt, ...);
23
* the return value is:
24
* -1 error in processing the object
25
* <0 return value of the callback, which lead to an abort
26
- * >0 return value of the first sigaled error >0 (in the case of no other errors)
26
+ * >0 return value of the first signaled error >0 (in the case of no other errors)
27
* 0 everything OK
28
*/
29
int fsck_walk(struct object *obj, fsck_walk_func walk, void *data);
git.c
+1
-1
@@ -497,7 +497,7 @@ int main(int argc, const char **argv)
497
498
/*
499
* We use PATH to find git commands, but we prepend some higher
500
- * precidence paths: the "--exec-path" option, the GIT_EXEC_PATH
500
+ * precedence paths: the "--exec-path" option, the GIT_EXEC_PATH
501
* environment, and the $(gitexecdir) from the Makefile at build
502
* time.
503
*/
graph.c
+1
-1
@@ -35,7 +35,7 @@ static void graph_padding_line(struct git_graph *graph, struct strbuf *sb);
35
* newline. A new graph line will not be printed after the final newline.
36
* If the strbuf is empty, no output will be printed.
37
*
38
- * Since the first line will not include the graph ouput, the caller is
38
+ * Since the first line will not include the graph output, the caller is
39
* responsible for printing this line's graph (perhaps via
40
* graph_show_commit() or graph_show_oneline()) before calling
41
* graph_show_strbuf().
levenshtein.c
+1
-1
@@ -27,7 +27,7 @@
27
*
28
* It does so by calculating the costs of the path ending in characters
29
* i (in string1) and j (in string2), respectively, given that the last
30
- * operation is a substition, a swap, a deletion, or an insertion.
30
+ * operation is a substitution, a swap, a deletion, or an insertion.
31
*
32
* This implementation allows the costs to be weighted:
33
*
parse-options.h
+4
-4
@@ -52,7 +52,7 @@ typedef int parse_opt_cb(const struct option *, const char *arg, int unset);
52
*
53
* `argh`::
54
* token to explain the kind of argument this option wants. Keep it
55
- * homogenous across the repository.
55
+ * homogeneous across the repository.
56
*
57
* `help`::
58
* the short help associated to what the option does.
@@ -61,7 +61,7 @@ typedef int parse_opt_cb(const struct option *, const char *arg, int unset);
61
*
62
* `flags`::
63
* mask of parse_opt_option_flags.
64
- * PARSE_OPT_OPTARG: says that the argument is optionnal (not for BOOLEANs)
64
+ * PARSE_OPT_OPTARG: says that the argument is optional (not for BOOLEANs)
65
* PARSE_OPT_NOARG: says that this option takes no argument, for CALLBACKs
66
* PARSE_OPT_NONEG: says that this option cannot be negated
67
* PARSE_OPT_HIDDEN this option is skipped in the default usage, showed in
@@ -105,7 +105,7 @@ struct option {
105
{ OPTION_CALLBACK, (s), (l), (v), (a), (h), 0, (f) }
106
107
/* parse_options() will filter out the processed options and leave the
108
- * non-option argments in argv[].
108
+ * non-option arguments in argv[].
109
* Returns the number of arguments left in argv[].
110
*/
111
extern int parse_options(int argc, const char **argv,
@@ -115,7 +115,7 @@ extern int parse_options(int argc, const char **argv,
115
extern NORETURN void usage_with_options(const char * const *usagestr,
116
const struct option *options);
117
118
-/*----- incremantal advanced APIs -----*/
118
+/*----- incremental advanced APIs -----*/
119
120
enum {
121
PARSE_OPT_HELP = -1,
revision.c
+1
-1
@@ -209,7 +209,7 @@ static struct commit *handle_commit(struct rev_info *revs, struct object *object
209
}
210
211
/*
212
- * Tree object? Either mark it uniniteresting, or add it
212
+ * Tree object? Either mark it uninteresting, or add it
213
* to the list of objects to look at later..
214
*/
215
if (object->type == OBJ_TREE) {
strbuf.h
+1
-1
@@ -11,7 +11,7 @@
11
* build complex strings/buffers whose final size isn't easily known.
12
*
13
* It is NOT legal to copy the ->buf pointer away.
14
- * `strbuf_detach' is the operation that detachs a buffer from its shell
14
+ * `strbuf_detach' is the operation that detaches a buffer from its shell
15
* while keeping the shell valid wrt its invariants.
16
*
17
* 2. the ->buf member is a byte array that has at least ->len + 1 bytes
tree-diff.c
+1
-1
@@ -374,7 +374,7 @@ static void try_to_follow_renames(struct tree_desc *t1, struct tree_desc *t2, co
374
}
375
376
/*
377
- * Then, discard all the non-relevane file pairs...
377
+ * Then, discard all the non-relevant file pairs...
378
*/
379
for (i = 0; i < q->nr; i++) {
380
struct diff_filepair *p = q->queue[i];
xdiff/xdiffi.c
+1
-1
@@ -456,7 +456,7 @@ int xdl_change_compact(xdfile_t *xdf, xdfile_t *xdfo, long flags) {
456
/*
457
* Record the end-of-group position in case we are matched
458
* with a group of changes in the other file (that is, the
459
- * change record before the enf-of-group index in the other
459
+ * change record before the end-of-group index in the other
460
* file is set).
461
*/
462
ixref = rchgo[ixo - 1] ? ix: nrec;