зеркало из https://github.com/microsoft/git.git
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 <gitster@pobox.com>
This commit is contained in:
Родитель
4b7acc186f
Коммит
9517e6b843
|
@ -2006,7 +2006,7 @@ static int find_pos(struct image *img,
|
||||||
return -1;
|
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
|
* point starting from a wrong line that will never match and
|
||||||
* wander around and wait for a match at the specified end.
|
* wander around and wait for a match at the specified end.
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -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'),
|
"exit with zero when there's no error", 'e'),
|
||||||
OPT_SET_INT('p', NULL, &opt, "pretty-print object's content", 'p'),
|
OPT_SET_INT('p', NULL, &opt, "pretty-print object's content", 'p'),
|
||||||
OPT_SET_INT(0, "batch", &batch,
|
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,
|
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),
|
BATCH_CHECK),
|
||||||
OPT_END()
|
OPT_END()
|
||||||
};
|
};
|
||||||
|
|
|
@ -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
|
* 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;
|
rev.show_root_diff = 1;
|
||||||
|
|
||||||
|
|
|
@ -106,7 +106,7 @@ static void prune_object_dir(const char *path)
|
||||||
/*
|
/*
|
||||||
* Write errors (particularly out of space) can result in
|
* Write errors (particularly out of space) can result in
|
||||||
* failed temporary packs (and more rarely indexes and other
|
* 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.
|
* and the pack directories.
|
||||||
*/
|
*/
|
||||||
static void remove_temporary_files(const char *path)
|
static void remove_temporary_files(const char *path)
|
||||||
|
|
|
@ -567,7 +567,7 @@ static int git_show_branch_config(const char *var, const char *value, void *cb)
|
||||||
return config_error_nonbool(var);
|
return config_error_nonbool(var);
|
||||||
/*
|
/*
|
||||||
* default_arg is now passed to parse_options(), so we need to
|
* 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) {
|
if (!default_num) {
|
||||||
default_alloc = 20;
|
default_alloc = 20;
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (C) 2009 Andrzej K. Haczewski <ahaczewski@gmail.com>
|
* 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.
|
* 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
|
* Git also makes sure that the passed arguments are valid, so there's
|
||||||
* no need for double-checking.
|
* no need for double-checking.
|
||||||
|
|
|
@ -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
|
* 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] == '[') {
|
if (host[0] == '[') {
|
||||||
end = strchr(host + 1, ']');
|
end = strchr(host + 1, ']');
|
||||||
|
|
|
@ -344,7 +344,7 @@ sub parsekeyvaluepair
|
||||||
|
|
||||||
Key and value strings may be enclosed in quotes, in which case
|
Key and value strings may be enclosed in quotes, in which case
|
||||||
whitespace inside the quotes is preserved. Additionally, an equal
|
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:
|
For example:
|
||||||
|
|
||||||
"key1 "=value1
|
"key1 "=value1
|
||||||
|
|
2
daemon.c
2
daemon.c
|
@ -407,7 +407,7 @@ static void parse_host_and_port(char *hostport, char **host,
|
||||||
|
|
||||||
end = strchr(hostport, ']');
|
end = strchr(hostport, ']');
|
||||||
if (!end)
|
if (!end)
|
||||||
die("Invalid reqeuest ('[' without ']')");
|
die("Invalid request ('[' without ']')");
|
||||||
*end = '\0';
|
*end = '\0';
|
||||||
*host = hostport + 1;
|
*host = hostport + 1;
|
||||||
if (!end[1])
|
if (!end[1])
|
||||||
|
|
2
diff.c
2
diff.c
|
@ -3642,7 +3642,7 @@ static void diffcore_skip_stat_unmatch(struct diff_options *diffopt)
|
||||||
struct diff_filepair *p = q->queue[i];
|
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),
|
* always have both sides (iow, not create/delete),
|
||||||
* one side of the object name is unknown, with
|
* one side of the object name is unknown, with
|
||||||
* the same mode and size. Keep the ones that
|
* the same mode and size. Keep the ones that
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
#define LEVENSHTEIN_H
|
#define LEVENSHTEIN_H
|
||||||
|
|
||||||
int levenshtein(const char *string1, const char *string2,
|
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);
|
int insertion_penalty, int deletion_penalty);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
2
path.c
2
path.c
|
@ -610,7 +610,7 @@ int daemon_avoid_alias(const char *p)
|
||||||
/*
|
/*
|
||||||
* This resurrects the belts and suspenders paranoia check by HPA
|
* This resurrects the belts and suspenders paranoia check by HPA
|
||||||
* done in <435560F7.4080006@zytor.com> thread, now enter_repo()
|
* 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
|
* sl becomes true immediately after seeing '/' and continues to
|
||||||
* be true as long as dots continue after that without intervening
|
* be true as long as dots continue after that without intervening
|
||||||
|
|
|
@ -204,14 +204,14 @@ sub repository {
|
||||||
$dir = $opts{Directory};
|
$dir = $opts{Directory};
|
||||||
|
|
||||||
unless (-d "$dir/refs" and -d "$dir/objects" and -e "$dir/HEAD") {
|
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");
|
throw Error::Simple("fatal: Not a git repository: $dir");
|
||||||
}
|
}
|
||||||
my $search = Git->repository(Repository => $dir);
|
my $search = Git->repository(Repository => $dir);
|
||||||
try {
|
try {
|
||||||
$search->command('symbolic-ref', 'HEAD');
|
$search->command('symbolic-ref', 'HEAD');
|
||||||
} catch Git::Error::Command with {
|
} 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");
|
throw Error::Simple("fatal: Not a git repository: $dir");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
2
refs.c
2
refs.c
|
@ -706,7 +706,7 @@ int for_each_glob_ref_in(each_ref_fn fn, const char *pattern,
|
||||||
|
|
||||||
has_glob_specials = strpbrk(pattern, "?*[");
|
has_glob_specials = strpbrk(pattern, "?*[");
|
||||||
if (!has_glob_specials) {
|
if (!has_glob_specials) {
|
||||||
/* Append impiled '/' '*' if not present. */
|
/* Append implied '/' '*' if not present. */
|
||||||
if (real_pattern.buf[real_pattern.len - 1] != '/')
|
if (real_pattern.buf[real_pattern.len - 1] != '/')
|
||||||
strbuf_addch(&real_pattern, '/');
|
strbuf_addch(&real_pattern, '/');
|
||||||
/* No need to check for '*', there is none. */
|
/* No need to check for '*', there is none. */
|
||||||
|
|
2
setup.c
2
setup.c
|
@ -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
|
* 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
|
* to the cwd, unless overridden by the config, the command line, or
|
||||||
* GIT_WORK_TREE.
|
* GIT_WORK_TREE.
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/*
|
/*
|
||||||
* This program can either change modification time of the given
|
* This program can either change modification time of the given
|
||||||
* file(s) or just print it. The program does not change atime nor
|
* 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:
|
* The mtime can be changed to an absolute value:
|
||||||
*
|
*
|
||||||
|
|
|
@ -171,7 +171,7 @@ static struct child_process *get_helper(struct transport *transport)
|
||||||
} else if (!strcmp(capname, "connect")) {
|
} else if (!strcmp(capname, "connect")) {
|
||||||
data->connect = 1;
|
data->connect = 1;
|
||||||
} else if (mandatory) {
|
} 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",
|
"helper probably needs newer version of Git.\n",
|
||||||
capname);
|
capname);
|
||||||
}
|
}
|
||||||
|
|
Загрузка…
Ссылка в новой задаче