Skip to content

Commit

Permalink
Typofixes outside documentation area
Browse files Browse the repository at this point in the history
    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 <gitster@pobox.com>
  • Loading branch information
gitster committed Feb 4, 2010
1 parent 4b7acc1 commit 9517e6b
Show file tree
Hide file tree
Showing 17 changed files with 20 additions and 19 deletions.
2 changes: 1 addition & 1 deletion builtin-apply.c
Expand Up @@ -2006,7 +2006,7 @@ static int find_pos(struct image *img,
return -1;

/*
* If match_begining or match_end is specified, there is no
* If match_beginning or match_end is specified, there is no
* point starting from a wrong line that will never match and
* wander around and wait for a match at the specified end.
*/
Expand Down
5 changes: 3 additions & 2 deletions builtin-cat-file.c
Expand Up @@ -219,9 +219,10 @@ int cmd_cat_file(int argc, const char **argv, const char *prefix)
"exit with zero when there's no error", 'e'),
OPT_SET_INT('p', NULL, &opt, "pretty-print object's content", 'p'),
OPT_SET_INT(0, "batch", &batch,
"show info and content of objects feeded on stdin", BATCH),
"show info and content of objects fed from the standard input",
BATCH),
OPT_SET_INT(0, "batch-check", &batch,
"show info about objects feeded on stdin",
"show info about objects fed from the standard input",
BATCH_CHECK),
OPT_END()
};
Expand Down
2 changes: 1 addition & 1 deletion builtin-log.c
Expand Up @@ -1089,7 +1089,7 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)

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

Expand Down
2 changes: 1 addition & 1 deletion builtin-prune.c
Expand Up @@ -106,7 +106,7 @@ static void prune_object_dir(const char *path)
/*
* Write errors (particularly out of space) can result in
* failed temporary packs (and more rarely indexes and other
* files begining with "tmp_") accumulating in the object
* files beginning with "tmp_") accumulating in the object
* and the pack directories.
*/
static void remove_temporary_files(const char *path)
Expand Down
2 changes: 1 addition & 1 deletion builtin-show-branch.c
Expand Up @@ -567,7 +567,7 @@ static int git_show_branch_config(const char *var, const char *value, void *cb)
return config_error_nonbool(var);
/*
* default_arg is now passed to parse_options(), so we need to
* mimick the real argv a bit better.
* mimic the real argv a bit better.
*/
if (!default_num) {
default_alloc = 20;
Expand Down
2 changes: 1 addition & 1 deletion compat/win32/pthread.c
@@ -1,7 +1,7 @@
/*
* Copyright (C) 2009 Andrzej K. Haczewski <ahaczewski@gmail.com>
*
* DISCLAMER: The implementation is Git-specific, it is subset of original
* DISCLAIMER: The implementation is Git-specific, it is subset of original
* Pthreads API, without lots of other features that Git doesn't use.
* Git also makes sure that the passed arguments are valid, so there's
* no need for double-checking.
Expand Down
2 changes: 1 addition & 1 deletion connect.c
Expand Up @@ -504,7 +504,7 @@ struct child_process *git_connect(int fd[2], const char *url_orig,

/*
* Don't do destructive transforms with git:// as that
* protocol code does '[]' dewrapping of its own.
* protocol code does '[]' unwrapping of its own.
*/
if (host[0] == '[') {
end = strchr(host + 1, ']');
Expand Down
2 changes: 1 addition & 1 deletion contrib/fast-import/import-directories.perl
Expand Up @@ -344,7 +344,7 @@ =head2 Escaping special characters
Key and value strings may be enclosed in quotes, in which case
whitespace inside the quotes is preserved. Additionally, an equal
sign may be included in the key by preceeding it with a backslash.
sign may be included in the key by preceding it with a backslash.
For example:
"key1 "=value1
Expand Down
2 changes: 1 addition & 1 deletion daemon.c
Expand Up @@ -407,7 +407,7 @@ static void parse_host_and_port(char *hostport, char **host,

end = strchr(hostport, ']');
if (!end)
die("Invalid reqeuest ('[' without ']')");
die("Invalid request ('[' without ']')");
*end = '\0';
*host = hostport + 1;
if (!end[1])
Expand Down
2 changes: 1 addition & 1 deletion diff.c
Expand Up @@ -3642,7 +3642,7 @@ static void diffcore_skip_stat_unmatch(struct diff_options *diffopt)
struct diff_filepair *p = q->queue[i];

/*
* 1. Entries that come from stat info dirtyness
* 1. Entries that come from stat info dirtiness
* always have both sides (iow, not create/delete),
* one side of the object name is unknown, with
* the same mode and size. Keep the ones that
Expand Down
2 changes: 1 addition & 1 deletion levenshtein.h
Expand Up @@ -2,7 +2,7 @@
#define LEVENSHTEIN_H

int levenshtein(const char *string1, const char *string2,
int swap_penalty, int substition_penalty,
int swap_penalty, int substitution_penalty,
int insertion_penalty, int deletion_penalty);

#endif
2 changes: 1 addition & 1 deletion path.c
Expand Up @@ -610,7 +610,7 @@ int daemon_avoid_alias(const char *p)
/*
* This resurrects the belts and suspenders paranoia check by HPA
* done in <435560F7.4080006@zytor.com> thread, now enter_repo()
* does not do getcwd() based path canonicalizations.
* does not do getcwd() based path canonicalization.
*
* sl becomes true immediately after seeing '/' and continues to
* be true as long as dots continue after that without intervening
Expand Down
4 changes: 2 additions & 2 deletions perl/Git.pm
Expand Up @@ -204,14 +204,14 @@ sub repository {
$dir = $opts{Directory};

unless (-d "$dir/refs" and -d "$dir/objects" and -e "$dir/HEAD") {
# Mimick git-rev-parse --git-dir error message:
# Mimic git-rev-parse --git-dir error message:
throw Error::Simple("fatal: Not a git repository: $dir");
}
my $search = Git->repository(Repository => $dir);
try {
$search->command('symbolic-ref', 'HEAD');
} catch Git::Error::Command with {
# Mimick git-rev-parse --git-dir error message:
# Mimic git-rev-parse --git-dir error message:
throw Error::Simple("fatal: Not a git repository: $dir");
}

Expand Down
2 changes: 1 addition & 1 deletion refs.c
Expand Up @@ -706,7 +706,7 @@ int for_each_glob_ref_in(each_ref_fn fn, const char *pattern,

has_glob_specials = strpbrk(pattern, "?*[");
if (!has_glob_specials) {
/* Append impiled '/' '*' if not present. */
/* Append implied '/' '*' if not present. */
if (real_pattern.buf[real_pattern.len - 1] != '/')
strbuf_addch(&real_pattern, '/');
/* No need to check for '*', there is none. */
Expand Down
2 changes: 1 addition & 1 deletion setup.c
Expand Up @@ -206,7 +206,7 @@ int is_inside_work_tree(void)
}

/*
* set_work_tree() is only ever called if you set GIT_DIR explicitely.
* set_work_tree() is only ever called if you set GIT_DIR explicitly.
* The old behaviour (which we retain here) is to set the work tree root
* to the cwd, unless overridden by the config, the command line, or
* GIT_WORK_TREE.
Expand Down
2 changes: 1 addition & 1 deletion test-chmtime.c
@@ -1,7 +1,7 @@
/*
* This program can either change modification time of the given
* file(s) or just print it. The program does not change atime nor
* ctime (their values are explicitely preserved).
* ctime (their values are explicitly preserved).
*
* The mtime can be changed to an absolute value:
*
Expand Down
2 changes: 1 addition & 1 deletion transport-helper.c
Expand Up @@ -171,7 +171,7 @@ static struct child_process *get_helper(struct transport *transport)
} else if (!strcmp(capname, "connect")) {
data->connect = 1;
} else if (mandatory) {
die("Unknown madatory capability %s. This remote "
die("Unknown mandatory capability %s. This remote "
"helper probably needs newer version of Git.\n",
capname);
}
Expand Down

0 comments on commit 9517e6b

Please sign in to comment.