Skip to content

Commit 2e3a16b

Browse files
scopgitster
authored andcommitted
Spelling fixes
<BAD> <CORRECTED> accidently accidentally commited committed dependancy dependency emtpy empty existance existence explicitely explicitly git-upload-achive git-upload-archive hierachy hierarchy indegee indegree intial initial mulitple multiple non-existant non-existent precendence. precedence. priviledged privileged programatically programmatically psuedo-binary pseudo-binary soemwhere somewhere successfull successful transfering transferring uncommited uncommitted unkown unknown usefull useful writting writing Signed-off-by: Ville Skyttä <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent a0a1831 commit 2e3a16b

25 files changed

+33
-33
lines changed

Documentation/RelNotes/2.3.10.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Fixes since v2.3.9
77
* xdiff code we use to generate diffs is not prepared to handle
88
extremely large files. It uses "int" in many places, which can
99
overflow if we have a very large number of lines or even bytes in
10-
our input files, for example. Cap the input size to soemwhere
10+
our input files, for example. Cap the input size to somewhere
1111
around 1GB for now.
1212

1313
* Some protocols (like git-remote-ext) can execute arbitrary code

Documentation/RelNotes/2.4.10.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Fixes since v2.4.9
77
* xdiff code we use to generate diffs is not prepared to handle
88
extremely large files. It uses "int" in many places, which can
99
overflow if we have a very large number of lines or even bytes in
10-
our input files, for example. Cap the input size to soemwhere
10+
our input files, for example. Cap the input size to somewhere
1111
around 1GB for now.
1212

1313
* Some protocols (like git-remote-ext) can execute arbitrary code

Documentation/RelNotes/2.5.4.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Fixes since v2.5.4
77
* xdiff code we use to generate diffs is not prepared to handle
88
extremely large files. It uses "int" in many places, which can
99
overflow if we have a very large number of lines or even bytes in
10-
our input files, for example. Cap the input size to soemwhere
10+
our input files, for example. Cap the input size to somewhere
1111
around 1GB for now.
1212

1313
* Some protocols (like git-remote-ext) can execute arbitrary code

Documentation/RelNotes/2.6.1.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Fixes since v2.6
77
* xdiff code we use to generate diffs is not prepared to handle
88
extremely large files. It uses "int" in many places, which can
99
overflow if we have a very large number of lines or even bytes in
10-
our input files, for example. Cap the input size to soemwhere
10+
our input files, for example. Cap the input size to somewhere
1111
around 1GB for now.
1212

1313
* Some protocols (like git-remote-ext) can execute arbitrary code

Documentation/git-remote-fd.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ fetch, push or archive.
1717

1818
If only <infd> is given, it is assumed to be a bidirectional socket connected
1919
to remote Git server (git-upload-pack, git-receive-pack or
20-
git-upload-achive). If both <infd> and <outfd> are given, they are assumed
20+
git-upload-archive). If both <infd> and <outfd> are given, they are assumed
2121
to be pipes connected to a remote Git server (<infd> being the inbound pipe
2222
and <outfd> being the outbound pipe.
2323

Documentation/gitattributes.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ Set to string value "auto"::
133133
When `text` is set to "auto", the path is marked for automatic
134134
end-of-line conversion. If Git decides that the content is
135135
text, its line endings are converted to LF on checkin.
136-
When the file has been commited with CRLF, no conversion is done.
136+
When the file has been committed with CRLF, no conversion is done.
137137

138138
Unspecified::
139139

Documentation/gitmodules.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ submodule.<name>.ignore::
8181

8282
submodule.<name>.shallow::
8383
When set to true, a clone of this submodule will be performed as a
84-
shallow clone unless the user explicitely asks for a non-shallow
84+
shallow clone unless the user explicitly asks for a non-shallow
8585
clone.
8686

8787

commit-slab.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
* After including this header file, using:
1010
*
11-
* define_commit_slab(indegee, int);
11+
* define_commit_slab(indegree, int);
1212
*
1313
* will let you call the following functions:
1414
*

contrib/hooks/multimail/README

+2-2
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ multimailhook.htmlInIntro, multimailhook.htmlInFooter
294294
like ``<a href="foo">link</a>``, the reader will see the HTML
295295
source code and not a proper link.
296296

297-
Set ``multimailhook.htmlInIntro`` to true to allow writting HTML
297+
Set ``multimailhook.htmlInIntro`` to true to allow writing HTML
298298
formatting in introduction templates. Similarly, set
299299
``multimailhook.htmlInFooter`` for HTML in the footer.
300300

@@ -516,7 +516,7 @@ multimailhook.commitLogOpts
516516

517517
multimailhook.dateSubstitute
518518
String to use as a substitute for ``Date:`` in the output of ``git
519-
log`` while formatting commit messages. This is usefull to avoid
519+
log`` while formatting commit messages. This is useful to avoid
520520
emitting a line that can be interpreted by mailers as the start of
521521
a cited message (Zimbra webmail in particular). Defaults to
522522
``CommitDate:``. Set to an empty string or ``none`` to deactivate

contrib/mw-to-git/.perlcriticrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
[InputOutput::RequireCheckedSyscalls]
2020
functions = open say close
2121

22-
# This rules demands to add a dependancy for the Readonly module. This is not
22+
# This rule demands to add a dependency for the Readonly module. This is not
2323
# wished.
2424
[-ValuesAndExpressions::ProhibitConstantPragma]
2525

contrib/mw-to-git/git-remote-mediawiki.perl

+1-1
Original file line numberDiff line numberDiff line change
@@ -963,7 +963,7 @@ sub mw_upload_file {
963963
print {*STDERR} "Check the configuration of file uploads in your mediawiki.\n";
964964
return $newrevid;
965965
}
966-
# Deleting and uploading a file requires a priviledged user
966+
# Deleting and uploading a file requires a privileged user
967967
if ($file_deleted) {
968968
$mediawiki = connect_maybe($mediawiki, $remotename, $url);
969969
my $query = {

contrib/subtree/t/t7900-subtree.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -948,7 +948,7 @@ test_expect_success 'split a new subtree without --onto option' '
948948
949949
# also test that we still can split out an entirely new subtree
950950
# if the parent of the first commit in the tree is not empty,
951-
# then the new subtree has accidently been attached to something
951+
# then the new subtree has accidentally been attached to something
952952
git subtree split --prefix="sub dir2" --branch subproj2-br &&
953953
check_equal "$(git log --pretty=format:%P -1 subproj2-br)" ""
954954
)

git-p4.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1934,7 +1934,7 @@ def run(self, args):
19341934
if self.useClientSpec:
19351935
self.clientSpecDirs = getClientSpec()
19361936

1937-
# Check for the existance of P4 branches
1937+
# Check for the existence of P4 branches
19381938
branchesDetected = (len(p4BranchesInGit().keys()) > 1)
19391939

19401940
if self.useClientSpec and not branchesDetected:

sha1_file.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1692,7 +1692,7 @@ static int parse_sha1_header_extended(const char *hdr, struct object_info *oi,
16921692
strbuf_add(oi->typename, type_buf, type_len);
16931693
/*
16941694
* Set type to 0 if its an unknown object and
1695-
* we're obtaining the type using '--allow-unkown-type'
1695+
* we're obtaining the type using '--allow-unknown-type'
16961696
* option.
16971697
*/
16981698
if ((flags & LOOKUP_UNKNOWN_OBJECT) && (type < 0))

t/README

+1-1
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ right, so this:
265265
$ sh ./t9200-git-cvsexport-commit.sh --run='1-4 !3'
266266

267267
will run tests 1, 2, and 4. Items that comes later have higher
268-
precendence. It means that this:
268+
precedence. It means that this:
269269

270270
$ sh ./t9200-git-cvsexport-commit.sh --run='!3 1-4'
271271

t/t1006-cat-file.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ $tag_content
231231
| git cat-file --batch)"
232232
'
233233

234-
test_expect_success "--batch-check for an emtpy line" '
234+
test_expect_success "--batch-check for an empty line" '
235235
test " missing" = "$(echo | git cat-file --batch-check)"
236236
'
237237

t/t3101-ls-tree-dirname.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ This test runs git ls-tree with the following in a tree.
1616
path3/1.txt - a file in a directory
1717
path3/2.txt - a file in a directory
1818
19-
Test the handling of mulitple directories which have matching file
19+
Test the handling of multiple directories which have matching file
2020
entries. Also test odd filename and missing entries handling.
2121
'
2222
. ./test-lib.sh

t/t3420-rebase-autostash.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ testrebase " --interactive" .git/rebase-merge
179179

180180
test_expect_success 'abort rebase -i with --autostash' '
181181
test_when_finished "git reset --hard" &&
182-
echo uncommited-content >file0 &&
182+
echo uncommitted-content >file0 &&
183183
(
184184
write_script abort-editor.sh <<-\EOF &&
185185
echo >"$1"
@@ -188,7 +188,7 @@ test_expect_success 'abort rebase -i with --autostash' '
188188
test_must_fail git rebase -i --autostash HEAD^ &&
189189
rm -f abort-editor.sh
190190
) &&
191-
echo uncommited-content >expected &&
191+
echo uncommitted-content >expected &&
192192
test_cmp expected file0
193193
'
194194

t/t6018-rev-list-glob.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ test_expect_success 'rev-list accumulates multiple --exclude' '
257257

258258

259259
# "git rev-list<ENTER>" is likely to be a bug in the calling script and may
260-
# deserve an error message, but do cases where set of refs programatically
260+
# deserve an error message, but do cases where set of refs programmatically
261261
# given using globbing and/or --stdin need to fail with the same error, or
262262
# are we better off reporting a success with no output? The following few
263263
# tests document the current behaviour to remind us that we might want to

t/t6030-bisect-porcelain.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -721,7 +721,7 @@ git bisect good 3de952f2416b6084f557ec417709eac740c6818c
721721
# first bad commit: [32a594a3fdac2d57cf6d02987e30eec68511498c] Add <4: Ciao for now> into <hello>.
722722
EOF
723723

724-
test_expect_success 'bisect log: successfull result' '
724+
test_expect_success 'bisect log: successful result' '
725725
git bisect reset &&
726726
git bisect start $HASH4 $HASH2 &&
727727
git bisect good &&

t/t7001-mv.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -292,8 +292,8 @@ test_expect_success 'setup submodule' '
292292
echo content >file &&
293293
git add file &&
294294
git commit -m "added sub and file" &&
295-
mkdir -p deep/directory/hierachy &&
296-
git submodule add ./. deep/directory/hierachy/sub &&
295+
mkdir -p deep/directory/hierarchy &&
296+
git submodule add ./. deep/directory/hierarchy/sub &&
297297
git commit -m "added another submodule" &&
298298
git branch submodule
299299
'
@@ -485,8 +485,8 @@ test_expect_success 'moving a submodule in nested directories' '
485485
# git status would fail if the update of linking git dir to
486486
# work dir of the submodule failed.
487487
git status &&
488-
git config -f ../.gitmodules submodule.deep/directory/hierachy/sub.path >../actual &&
489-
echo "directory/hierachy/sub" >../expect
488+
git config -f ../.gitmodules submodule.deep/directory/hierarchy/sub.path >../actual &&
489+
echo "directory/hierarchy/sub" >../expect
490490
) &&
491491
test_cmp actual expect
492492
'

t/t7810-grep.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -581,7 +581,7 @@ test_expect_success 'log grep (9)' '
581581
'
582582

583583
test_expect_success 'log grep (9)' '
584-
git log -g --grep-reflog="commit: third" --author="non-existant" --pretty=tformat:%s >actual &&
584+
git log -g --grep-reflog="commit: third" --author="non-existent" --pretty=tformat:%s >actual &&
585585
: >expect &&
586586
test_cmp expect actual
587587
'

t/t9401-git-cvsserver-crlf.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ test_expect_success 'adding files' '
154154
echo "more text" > src.c &&
155155
GIT_CONFIG="$git_config" cvs -Q add src.c >cvs.log 2>&1 &&
156156
marked_as . src.c "" &&
157-
echo "psuedo-binary" > temp.bin
157+
echo "pseudo-binary" > temp.bin
158158
) &&
159159
GIT_CONFIG="$git_config" cvs -Q add subdir/temp.bin >cvs.log 2>&1 &&
160160
marked_as subdir temp.bin "-kb" &&

transport-helper.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -1103,7 +1103,7 @@ static void transfer_debug(const char *fmt, ...)
11031103
}
11041104

11051105
/* Stream state: More data may be coming in this direction. */
1106-
#define SSTATE_TRANSFERING 0
1106+
#define SSTATE_TRANSFERRING 0
11071107
/*
11081108
* Stream state: No more data coming in this direction, flushing rest of
11091109
* data.
@@ -1112,7 +1112,7 @@ static void transfer_debug(const char *fmt, ...)
11121112
/* Stream state: Transfer in this direction finished. */
11131113
#define SSTATE_FINISHED 2
11141114

1115-
#define STATE_NEEDS_READING(state) ((state) <= SSTATE_TRANSFERING)
1115+
#define STATE_NEEDS_READING(state) ((state) <= SSTATE_TRANSFERRING)
11161116
#define STATE_NEEDS_WRITING(state) ((state) <= SSTATE_FLUSHING)
11171117
#define STATE_NEEDS_CLOSING(state) ((state) == SSTATE_FLUSHING)
11181118

@@ -1369,7 +1369,7 @@ int bidirectional_transfer_loop(int input, int output)
13691369
state.ptg.dest = 1;
13701370
state.ptg.src_is_sock = (input == output);
13711371
state.ptg.dest_is_sock = 0;
1372-
state.ptg.state = SSTATE_TRANSFERING;
1372+
state.ptg.state = SSTATE_TRANSFERRING;
13731373
state.ptg.bufuse = 0;
13741374
state.ptg.src_name = "remote input";
13751375
state.ptg.dest_name = "stdout";
@@ -1378,7 +1378,7 @@ int bidirectional_transfer_loop(int input, int output)
13781378
state.gtp.dest = output;
13791379
state.gtp.src_is_sock = 0;
13801380
state.gtp.dest_is_sock = (input == output);
1381-
state.gtp.state = SSTATE_TRANSFERING;
1381+
state.gtp.state = SSTATE_TRANSFERRING;
13821382
state.gtp.bufuse = 0;
13831383
state.gtp.src_name = "stdin";
13841384
state.gtp.dest_name = "remote output";

upload-pack.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -836,7 +836,7 @@ int cmd_main(int argc, const char **argv)
836836
OPT_BOOL(0, "stateless-rpc", &stateless_rpc,
837837
N_("quit after a single request/response exchange")),
838838
OPT_BOOL(0, "advertise-refs", &advertise_refs,
839-
N_("exit immediately after intial ref advertisement")),
839+
N_("exit immediately after initial ref advertisement")),
840840
OPT_BOOL(0, "strict", &strict,
841841
N_("do not try <directory>/.git/ if <directory> is no Git directory")),
842842
OPT_INTEGER(0, "timeout", &timeout,

0 commit comments

Comments
 (0)