Skip to content

Commit 9517e6b

Browse files
committed
Typofixes outside documentation area
begining -> beginning canonicalizations -> canonicalization comand -> command dewrapping -> unwrapping dirtyness -> dirtiness DISCLAMER -> DISCLAIMER explicitely -> explicitly feeded -> fed impiled -> implied madatory -> mandatory mimick -> mimic preceeding -> preceding reqeuest -> request substition -> substitution Signed-off-by: Junio C Hamano <[email protected]>
1 parent 4b7acc1 commit 9517e6b

17 files changed

+20
-19
lines changed

builtin-apply.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -2006,7 +2006,7 @@ static int find_pos(struct image *img,
20062006
return -1;
20072007

20082008
/*
2009-
* If match_begining or match_end is specified, there is no
2009+
* If match_beginning or match_end is specified, there is no
20102010
* point starting from a wrong line that will never match and
20112011
* wander around and wait for a match at the specified end.
20122012
*/

builtin-cat-file.c

+3-2
Original file line numberDiff line numberDiff line change
@@ -219,9 +219,10 @@ int cmd_cat_file(int argc, const char **argv, const char *prefix)
219219
"exit with zero when there's no error", 'e'),
220220
OPT_SET_INT('p', NULL, &opt, "pretty-print object's content", 'p'),
221221
OPT_SET_INT(0, "batch", &batch,
222-
"show info and content of objects feeded on stdin", BATCH),
222+
"show info and content of objects fed from the standard input",
223+
BATCH),
223224
OPT_SET_INT(0, "batch-check", &batch,
224-
"show info about objects feeded on stdin",
225+
"show info about objects fed from the standard input",
225226
BATCH_CHECK),
226227
OPT_END()
227228
};

builtin-log.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1089,7 +1089,7 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
10891089

10901090
/*
10911091
* We cannot move this anywhere earlier because we do want to
1092-
* know if --root was given explicitly from the comand line.
1092+
* know if --root was given explicitly from the command line.
10931093
*/
10941094
rev.show_root_diff = 1;
10951095

builtin-prune.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ static void prune_object_dir(const char *path)
106106
/*
107107
* Write errors (particularly out of space) can result in
108108
* failed temporary packs (and more rarely indexes and other
109-
* files begining with "tmp_") accumulating in the object
109+
* files beginning with "tmp_") accumulating in the object
110110
* and the pack directories.
111111
*/
112112
static void remove_temporary_files(const char *path)

builtin-show-branch.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -567,7 +567,7 @@ static int git_show_branch_config(const char *var, const char *value, void *cb)
567567
return config_error_nonbool(var);
568568
/*
569569
* default_arg is now passed to parse_options(), so we need to
570-
* mimick the real argv a bit better.
570+
* mimic the real argv a bit better.
571571
*/
572572
if (!default_num) {
573573
default_alloc = 20;

compat/win32/pthread.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Copyright (C) 2009 Andrzej K. Haczewski <[email protected]>
33
*
4-
* DISCLAMER: The implementation is Git-specific, it is subset of original
4+
* DISCLAIMER: The implementation is Git-specific, it is subset of original
55
* Pthreads API, without lots of other features that Git doesn't use.
66
* Git also makes sure that the passed arguments are valid, so there's
77
* no need for double-checking.

connect.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -504,7 +504,7 @@ struct child_process *git_connect(int fd[2], const char *url_orig,
504504

505505
/*
506506
* Don't do destructive transforms with git:// as that
507-
* protocol code does '[]' dewrapping of its own.
507+
* protocol code does '[]' unwrapping of its own.
508508
*/
509509
if (host[0] == '[') {
510510
end = strchr(host + 1, ']');

contrib/fast-import/import-directories.perl

+1-1
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,7 @@ =head2 Escaping special characters
344344
345345
Key and value strings may be enclosed in quotes, in which case
346346
whitespace inside the quotes is preserved. Additionally, an equal
347-
sign may be included in the key by preceeding it with a backslash.
347+
sign may be included in the key by preceding it with a backslash.
348348
For example:
349349
350350
"key1 "=value1

daemon.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -407,7 +407,7 @@ static void parse_host_and_port(char *hostport, char **host,
407407

408408
end = strchr(hostport, ']');
409409
if (!end)
410-
die("Invalid reqeuest ('[' without ']')");
410+
die("Invalid request ('[' without ']')");
411411
*end = '\0';
412412
*host = hostport + 1;
413413
if (!end[1])

diff.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -3642,7 +3642,7 @@ static void diffcore_skip_stat_unmatch(struct diff_options *diffopt)
36423642
struct diff_filepair *p = q->queue[i];
36433643

36443644
/*
3645-
* 1. Entries that come from stat info dirtyness
3645+
* 1. Entries that come from stat info dirtiness
36463646
* always have both sides (iow, not create/delete),
36473647
* one side of the object name is unknown, with
36483648
* the same mode and size. Keep the ones that

levenshtein.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#define LEVENSHTEIN_H
33

44
int levenshtein(const char *string1, const char *string2,
5-
int swap_penalty, int substition_penalty,
5+
int swap_penalty, int substitution_penalty,
66
int insertion_penalty, int deletion_penalty);
77

88
#endif

path.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -610,7 +610,7 @@ int daemon_avoid_alias(const char *p)
610610
/*
611611
* This resurrects the belts and suspenders paranoia check by HPA
612612
* done in <[email protected]> thread, now enter_repo()
613-
* does not do getcwd() based path canonicalizations.
613+
* does not do getcwd() based path canonicalization.
614614
*
615615
* sl becomes true immediately after seeing '/' and continues to
616616
* be true as long as dots continue after that without intervening

perl/Git.pm

+2-2
Original file line numberDiff line numberDiff line change
@@ -204,14 +204,14 @@ sub repository {
204204
$dir = $opts{Directory};
205205

206206
unless (-d "$dir/refs" and -d "$dir/objects" and -e "$dir/HEAD") {
207-
# Mimick git-rev-parse --git-dir error message:
207+
# Mimic git-rev-parse --git-dir error message:
208208
throw Error::Simple("fatal: Not a git repository: $dir");
209209
}
210210
my $search = Git->repository(Repository => $dir);
211211
try {
212212
$search->command('symbolic-ref', 'HEAD');
213213
} catch Git::Error::Command with {
214-
# Mimick git-rev-parse --git-dir error message:
214+
# Mimic git-rev-parse --git-dir error message:
215215
throw Error::Simple("fatal: Not a git repository: $dir");
216216
}
217217

refs.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -706,7 +706,7 @@ int for_each_glob_ref_in(each_ref_fn fn, const char *pattern,
706706

707707
has_glob_specials = strpbrk(pattern, "?*[");
708708
if (!has_glob_specials) {
709-
/* Append impiled '/' '*' if not present. */
709+
/* Append implied '/' '*' if not present. */
710710
if (real_pattern.buf[real_pattern.len - 1] != '/')
711711
strbuf_addch(&real_pattern, '/');
712712
/* No need to check for '*', there is none. */

setup.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ int is_inside_work_tree(void)
206206
}
207207

208208
/*
209-
* set_work_tree() is only ever called if you set GIT_DIR explicitely.
209+
* set_work_tree() is only ever called if you set GIT_DIR explicitly.
210210
* The old behaviour (which we retain here) is to set the work tree root
211211
* to the cwd, unless overridden by the config, the command line, or
212212
* GIT_WORK_TREE.

test-chmtime.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* This program can either change modification time of the given
33
* file(s) or just print it. The program does not change atime nor
4-
* ctime (their values are explicitely preserved).
4+
* ctime (their values are explicitly preserved).
55
*
66
* The mtime can be changed to an absolute value:
77
*

transport-helper.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ static struct child_process *get_helper(struct transport *transport)
171171
} else if (!strcmp(capname, "connect")) {
172172
data->connect = 1;
173173
} else if (mandatory) {
174-
die("Unknown madatory capability %s. This remote "
174+
die("Unknown mandatory capability %s. This remote "
175175
"helper probably needs newer version of Git.\n",
176176
capname);
177177
}

0 commit comments

Comments
 (0)