зеркало из https://github.com/microsoft/git.git
Merge branch 'vs/typofix'
* vs/typofix: Spelling fixes
This commit is contained in:
Коммит
e6b8f80653
|
@ -7,7 +7,7 @@ Fixes since v2.3.9
|
|||
* xdiff code we use to generate diffs is not prepared to handle
|
||||
extremely large files. It uses "int" in many places, which can
|
||||
overflow if we have a very large number of lines or even bytes in
|
||||
our input files, for example. Cap the input size to soemwhere
|
||||
our input files, for example. Cap the input size to somewhere
|
||||
around 1GB for now.
|
||||
|
||||
* Some protocols (like git-remote-ext) can execute arbitrary code
|
||||
|
|
|
@ -7,7 +7,7 @@ Fixes since v2.4.9
|
|||
* xdiff code we use to generate diffs is not prepared to handle
|
||||
extremely large files. It uses "int" in many places, which can
|
||||
overflow if we have a very large number of lines or even bytes in
|
||||
our input files, for example. Cap the input size to soemwhere
|
||||
our input files, for example. Cap the input size to somewhere
|
||||
around 1GB for now.
|
||||
|
||||
* Some protocols (like git-remote-ext) can execute arbitrary code
|
||||
|
|
|
@ -7,7 +7,7 @@ Fixes since v2.5.4
|
|||
* xdiff code we use to generate diffs is not prepared to handle
|
||||
extremely large files. It uses "int" in many places, which can
|
||||
overflow if we have a very large number of lines or even bytes in
|
||||
our input files, for example. Cap the input size to soemwhere
|
||||
our input files, for example. Cap the input size to somewhere
|
||||
around 1GB for now.
|
||||
|
||||
* Some protocols (like git-remote-ext) can execute arbitrary code
|
||||
|
|
|
@ -7,7 +7,7 @@ Fixes since v2.6
|
|||
* xdiff code we use to generate diffs is not prepared to handle
|
||||
extremely large files. It uses "int" in many places, which can
|
||||
overflow if we have a very large number of lines or even bytes in
|
||||
our input files, for example. Cap the input size to soemwhere
|
||||
our input files, for example. Cap the input size to somewhere
|
||||
around 1GB for now.
|
||||
|
||||
* Some protocols (like git-remote-ext) can execute arbitrary code
|
||||
|
|
|
@ -17,7 +17,7 @@ fetch, push or archive.
|
|||
|
||||
If only <infd> is given, it is assumed to be a bidirectional socket connected
|
||||
to remote Git server (git-upload-pack, git-receive-pack or
|
||||
git-upload-achive). If both <infd> and <outfd> are given, they are assumed
|
||||
git-upload-archive). If both <infd> and <outfd> are given, they are assumed
|
||||
to be pipes connected to a remote Git server (<infd> being the inbound pipe
|
||||
and <outfd> being the outbound pipe.
|
||||
|
||||
|
|
|
@ -133,7 +133,7 @@ Set to string value "auto"::
|
|||
When `text` is set to "auto", the path is marked for automatic
|
||||
end-of-line conversion. If Git decides that the content is
|
||||
text, its line endings are converted to LF on checkin.
|
||||
When the file has been commited with CRLF, no conversion is done.
|
||||
When the file has been committed with CRLF, no conversion is done.
|
||||
|
||||
Unspecified::
|
||||
|
||||
|
|
|
@ -81,7 +81,7 @@ submodule.<name>.ignore::
|
|||
|
||||
submodule.<name>.shallow::
|
||||
When set to true, a clone of this submodule will be performed as a
|
||||
shallow clone unless the user explicitely asks for a non-shallow
|
||||
shallow clone unless the user explicitly asks for a non-shallow
|
||||
clone.
|
||||
|
||||
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
*
|
||||
* After including this header file, using:
|
||||
*
|
||||
* define_commit_slab(indegee, int);
|
||||
* define_commit_slab(indegree, int);
|
||||
*
|
||||
* will let you call the following functions:
|
||||
*
|
||||
|
|
|
@ -294,7 +294,7 @@ multimailhook.htmlInIntro, multimailhook.htmlInFooter
|
|||
like ``<a href="foo">link</a>``, the reader will see the HTML
|
||||
source code and not a proper link.
|
||||
|
||||
Set ``multimailhook.htmlInIntro`` to true to allow writting HTML
|
||||
Set ``multimailhook.htmlInIntro`` to true to allow writing HTML
|
||||
formatting in introduction templates. Similarly, set
|
||||
``multimailhook.htmlInFooter`` for HTML in the footer.
|
||||
|
||||
|
@ -516,7 +516,7 @@ multimailhook.commitLogOpts
|
|||
|
||||
multimailhook.dateSubstitute
|
||||
String to use as a substitute for ``Date:`` in the output of ``git
|
||||
log`` while formatting commit messages. This is usefull to avoid
|
||||
log`` while formatting commit messages. This is useful to avoid
|
||||
emitting a line that can be interpreted by mailers as the start of
|
||||
a cited message (Zimbra webmail in particular). Defaults to
|
||||
``CommitDate:``. Set to an empty string or ``none`` to deactivate
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
[InputOutput::RequireCheckedSyscalls]
|
||||
functions = open say close
|
||||
|
||||
# This rules demands to add a dependancy for the Readonly module. This is not
|
||||
# This rule demands to add a dependency for the Readonly module. This is not
|
||||
# wished.
|
||||
[-ValuesAndExpressions::ProhibitConstantPragma]
|
||||
|
||||
|
|
|
@ -963,7 +963,7 @@ sub mw_upload_file {
|
|||
print {*STDERR} "Check the configuration of file uploads in your mediawiki.\n";
|
||||
return $newrevid;
|
||||
}
|
||||
# Deleting and uploading a file requires a priviledged user
|
||||
# Deleting and uploading a file requires a privileged user
|
||||
if ($file_deleted) {
|
||||
$mediawiki = connect_maybe($mediawiki, $remotename, $url);
|
||||
my $query = {
|
||||
|
|
|
@ -948,7 +948,7 @@ test_expect_success 'split a new subtree without --onto option' '
|
|||
|
||||
# also test that we still can split out an entirely new subtree
|
||||
# if the parent of the first commit in the tree is not empty,
|
||||
# then the new subtree has accidently been attached to something
|
||||
# then the new subtree has accidentally been attached to something
|
||||
git subtree split --prefix="sub dir2" --branch subproj2-br &&
|
||||
check_equal "$(git log --pretty=format:%P -1 subproj2-br)" ""
|
||||
)
|
||||
|
|
|
@ -1934,7 +1934,7 @@ class P4Submit(Command, P4UserMap):
|
|||
if self.useClientSpec:
|
||||
self.clientSpecDirs = getClientSpec()
|
||||
|
||||
# Check for the existance of P4 branches
|
||||
# Check for the existence of P4 branches
|
||||
branchesDetected = (len(p4BranchesInGit().keys()) > 1)
|
||||
|
||||
if self.useClientSpec and not branchesDetected:
|
||||
|
|
|
@ -1692,7 +1692,7 @@ static int parse_sha1_header_extended(const char *hdr, struct object_info *oi,
|
|||
strbuf_add(oi->typename, type_buf, type_len);
|
||||
/*
|
||||
* Set type to 0 if its an unknown object and
|
||||
* we're obtaining the type using '--allow-unkown-type'
|
||||
* we're obtaining the type using '--allow-unknown-type'
|
||||
* option.
|
||||
*/
|
||||
if ((flags & LOOKUP_UNKNOWN_OBJECT) && (type < 0))
|
||||
|
|
2
t/README
2
t/README
|
@ -265,7 +265,7 @@ right, so this:
|
|||
$ sh ./t9200-git-cvsexport-commit.sh --run='1-4 !3'
|
||||
|
||||
will run tests 1, 2, and 4. Items that comes later have higher
|
||||
precendence. It means that this:
|
||||
precedence. It means that this:
|
||||
|
||||
$ sh ./t9200-git-cvsexport-commit.sh --run='!3 1-4'
|
||||
|
||||
|
|
|
@ -231,7 +231,7 @@ $tag_content
|
|||
| git cat-file --batch)"
|
||||
'
|
||||
|
||||
test_expect_success "--batch-check for an emtpy line" '
|
||||
test_expect_success "--batch-check for an empty line" '
|
||||
test " missing" = "$(echo | git cat-file --batch-check)"
|
||||
'
|
||||
|
||||
|
|
|
@ -16,7 +16,7 @@ This test runs git ls-tree with the following in a tree.
|
|||
path3/1.txt - a file in a directory
|
||||
path3/2.txt - a file in a directory
|
||||
|
||||
Test the handling of mulitple directories which have matching file
|
||||
Test the handling of multiple directories which have matching file
|
||||
entries. Also test odd filename and missing entries handling.
|
||||
'
|
||||
. ./test-lib.sh
|
||||
|
|
|
@ -179,7 +179,7 @@ testrebase " --interactive" .git/rebase-merge
|
|||
|
||||
test_expect_success 'abort rebase -i with --autostash' '
|
||||
test_when_finished "git reset --hard" &&
|
||||
echo uncommited-content >file0 &&
|
||||
echo uncommitted-content >file0 &&
|
||||
(
|
||||
write_script abort-editor.sh <<-\EOF &&
|
||||
echo >"$1"
|
||||
|
@ -188,7 +188,7 @@ test_expect_success 'abort rebase -i with --autostash' '
|
|||
test_must_fail git rebase -i --autostash HEAD^ &&
|
||||
rm -f abort-editor.sh
|
||||
) &&
|
||||
echo uncommited-content >expected &&
|
||||
echo uncommitted-content >expected &&
|
||||
test_cmp expected file0
|
||||
'
|
||||
|
||||
|
|
|
@ -257,7 +257,7 @@ test_expect_success 'rev-list accumulates multiple --exclude' '
|
|||
|
||||
|
||||
# "git rev-list<ENTER>" is likely to be a bug in the calling script and may
|
||||
# deserve an error message, but do cases where set of refs programatically
|
||||
# deserve an error message, but do cases where set of refs programmatically
|
||||
# given using globbing and/or --stdin need to fail with the same error, or
|
||||
# are we better off reporting a success with no output? The following few
|
||||
# tests document the current behaviour to remind us that we might want to
|
||||
|
|
|
@ -721,7 +721,7 @@ git bisect good 3de952f2416b6084f557ec417709eac740c6818c
|
|||
# first bad commit: [32a594a3fdac2d57cf6d02987e30eec68511498c] Add <4: Ciao for now> into <hello>.
|
||||
EOF
|
||||
|
||||
test_expect_success 'bisect log: successfull result' '
|
||||
test_expect_success 'bisect log: successful result' '
|
||||
git bisect reset &&
|
||||
git bisect start $HASH4 $HASH2 &&
|
||||
git bisect good &&
|
||||
|
|
|
@ -292,8 +292,8 @@ test_expect_success 'setup submodule' '
|
|||
echo content >file &&
|
||||
git add file &&
|
||||
git commit -m "added sub and file" &&
|
||||
mkdir -p deep/directory/hierachy &&
|
||||
git submodule add ./. deep/directory/hierachy/sub &&
|
||||
mkdir -p deep/directory/hierarchy &&
|
||||
git submodule add ./. deep/directory/hierarchy/sub &&
|
||||
git commit -m "added another submodule" &&
|
||||
git branch submodule
|
||||
'
|
||||
|
@ -485,8 +485,8 @@ test_expect_success 'moving a submodule in nested directories' '
|
|||
# git status would fail if the update of linking git dir to
|
||||
# work dir of the submodule failed.
|
||||
git status &&
|
||||
git config -f ../.gitmodules submodule.deep/directory/hierachy/sub.path >../actual &&
|
||||
echo "directory/hierachy/sub" >../expect
|
||||
git config -f ../.gitmodules submodule.deep/directory/hierarchy/sub.path >../actual &&
|
||||
echo "directory/hierarchy/sub" >../expect
|
||||
) &&
|
||||
test_cmp actual expect
|
||||
'
|
||||
|
|
|
@ -581,7 +581,7 @@ test_expect_success 'log grep (9)' '
|
|||
'
|
||||
|
||||
test_expect_success 'log grep (9)' '
|
||||
git log -g --grep-reflog="commit: third" --author="non-existant" --pretty=tformat:%s >actual &&
|
||||
git log -g --grep-reflog="commit: third" --author="non-existent" --pretty=tformat:%s >actual &&
|
||||
: >expect &&
|
||||
test_cmp expect actual
|
||||
'
|
||||
|
|
|
@ -154,7 +154,7 @@ test_expect_success 'adding files' '
|
|||
echo "more text" > src.c &&
|
||||
GIT_CONFIG="$git_config" cvs -Q add src.c >cvs.log 2>&1 &&
|
||||
marked_as . src.c "" &&
|
||||
echo "psuedo-binary" > temp.bin
|
||||
echo "pseudo-binary" > temp.bin
|
||||
) &&
|
||||
GIT_CONFIG="$git_config" cvs -Q add subdir/temp.bin >cvs.log 2>&1 &&
|
||||
marked_as subdir temp.bin "-kb" &&
|
||||
|
|
|
@ -1103,7 +1103,7 @@ static void transfer_debug(const char *fmt, ...)
|
|||
}
|
||||
|
||||
/* Stream state: More data may be coming in this direction. */
|
||||
#define SSTATE_TRANSFERING 0
|
||||
#define SSTATE_TRANSFERRING 0
|
||||
/*
|
||||
* Stream state: No more data coming in this direction, flushing rest of
|
||||
* data.
|
||||
|
@ -1112,7 +1112,7 @@ static void transfer_debug(const char *fmt, ...)
|
|||
/* Stream state: Transfer in this direction finished. */
|
||||
#define SSTATE_FINISHED 2
|
||||
|
||||
#define STATE_NEEDS_READING(state) ((state) <= SSTATE_TRANSFERING)
|
||||
#define STATE_NEEDS_READING(state) ((state) <= SSTATE_TRANSFERRING)
|
||||
#define STATE_NEEDS_WRITING(state) ((state) <= SSTATE_FLUSHING)
|
||||
#define STATE_NEEDS_CLOSING(state) ((state) == SSTATE_FLUSHING)
|
||||
|
||||
|
@ -1369,7 +1369,7 @@ int bidirectional_transfer_loop(int input, int output)
|
|||
state.ptg.dest = 1;
|
||||
state.ptg.src_is_sock = (input == output);
|
||||
state.ptg.dest_is_sock = 0;
|
||||
state.ptg.state = SSTATE_TRANSFERING;
|
||||
state.ptg.state = SSTATE_TRANSFERRING;
|
||||
state.ptg.bufuse = 0;
|
||||
state.ptg.src_name = "remote input";
|
||||
state.ptg.dest_name = "stdout";
|
||||
|
@ -1378,7 +1378,7 @@ int bidirectional_transfer_loop(int input, int output)
|
|||
state.gtp.dest = output;
|
||||
state.gtp.src_is_sock = 0;
|
||||
state.gtp.dest_is_sock = (input == output);
|
||||
state.gtp.state = SSTATE_TRANSFERING;
|
||||
state.gtp.state = SSTATE_TRANSFERRING;
|
||||
state.gtp.bufuse = 0;
|
||||
state.gtp.src_name = "stdin";
|
||||
state.gtp.dest_name = "remote output";
|
||||
|
|
|
@ -836,7 +836,7 @@ int cmd_main(int argc, const char **argv)
|
|||
OPT_BOOL(0, "stateless-rpc", &stateless_rpc,
|
||||
N_("quit after a single request/response exchange")),
|
||||
OPT_BOOL(0, "advertise-refs", &advertise_refs,
|
||||
N_("exit immediately after intial ref advertisement")),
|
||||
N_("exit immediately after initial ref advertisement")),
|
||||
OPT_BOOL(0, "strict", &strict,
|
||||
N_("do not try <directory>/.git/ if <directory> is no Git directory")),
|
||||
OPT_INTEGER(0, "timeout", &timeout,
|
||||
|
|
Загрузка…
Ссылка в новой задаче