@matheusbsbs / matheus-bagliano / commits / 3dff5379bf
Fork 0

Assorted typo fixes

Signed-off-by: Junio C Hamano <junkio@cox.net>

Pavel Roskin committed Feb 3, 2007 at 23:49 UTC 3dff5379bf1e3fda5e5a84ca5813b0c0cfd51be7
27 files changed +41 -41
Documentation/config.txt
+1 -1
@@ -39,7 +39,7 @@ in the section header, like in example below:
39
40 Subsection names can contain any characters except newline (doublequote
41 '`"`' and backslash have to be escaped as '`\"`' and '`\\`',
42 -respecitvely) and are case sensitive. Section header cannot span multiple
42 +respectively) and are case sensitive. Section header cannot span multiple
43 lines. Variables may belong directly to a section or to a given subsection.
44 You can have `[section]` if you have `[section "subsection"]`, but you
45 don't need to.
Documentation/diff-format.txt
+1 -1
@@ -159,7 +159,7 @@ or like this (when '--cc' option is used):
159 deleted file mode <mode>,<mode>
160 +
161 The `mode <mode>,<mode>..<mode>` line appears only if at least one of
162 -the <mode> is diferent from the rest. Extended headers with
162 +the <mode> is different from the rest. Extended headers with
163 information about detected contents movement (renames and
164 copying detection) are designed to work with diff of two
165 <tree-ish> and are not used by combined diff format.
Documentation/git-send-pack.txt
+1 -1
@@ -3,7 +3,7 @@ git-send-pack(1)
3
4 NAME
5 ----
6 -git-send-pack - Push objects over git protocol to another reposiotory
6 +git-send-pack - Push objects over git protocol to another repository
7
8
9 SYNOPSIS
Documentation/git-svn.txt
+1 -1
@@ -133,7 +133,7 @@ manually joining branches on commit.
133
134 'multi-init'::
135 This command supports git-svnimport-like command-line syntax for
136 - importing repositories that are layed out as recommended by the
136 + importing repositories that are laid out as recommended by the
137 SVN folks. This is a bit more tolerant than the git-svnimport
138 command-line syntax and doesn't require the user to figure out
139 where the repository URL ends and where the repository path
Documentation/gitk.txt
+1 -1
@@ -54,7 +54,7 @@ frequently used options.
54
55 Limit commits to the ones touching files in the given paths. Note, to
56 avoid ambiguity wrt. revision names use "--" to separate the paths
57 - from any preceeding options.
57 + from any preceding options.
58
59 Examples
60 --------
Documentation/user-manual.txt
+5 -5
@@ -425,8 +425,8 @@ if commit X is an ancestor of commit Y. Equivalently, you could say
425 that Y is a descendent of X, or that there is a chain of parents
426 leading from commit Y to commit X.
427
428 -Undestanding history: History diagrams
429 -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
428 +Understanding history: History diagrams
429 +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
430
431 We will sometimes represent git history using diagrams like the one
432 below. Commits are shown as "o", and the links between them with
@@ -806,7 +806,7 @@ display options.
806
807 Note that git log starts with the most recent commit and works
808 backwards through the parents; however, since git history can contain
809 -multiple independant lines of development, the particular order that
809 +multiple independent lines of development, the particular order that
810 commits are listed in may be somewhat arbitrary.
811
812 Generating diffs
@@ -1075,7 +1075,7 @@ $ git commit
1075 -------------------------------------------------
1076
1077 and git will prompt you for a commit message and then create the new
1078 -commmit. Check to make sure it looks like what you expected with
1078 +commit. Check to make sure it looks like what you expected with
1079
1080 -------------------------------------------------
1081 $ git show
@@ -2953,7 +2953,7 @@ Include cross-references to the glossary, where appropriate.
2953 Document shallow clones? See draft 1.5.0 release notes for some
2954 documentation.
2955
2956 -Add a sectin on working with other version control systems, including
2956 +Add a section on working with other version control systems, including
2957 CVS, Subversion, and just imports of series of release tarballs.
2958
2959 More details on gitweb?
builtin-blame.c
+3 -3
@@ -550,7 +550,7 @@ static void free_patch(struct patch *p)
550 }
551
552 /*
553 - * Link in a new blame entry to the scorebord. Entries that cover the
553 + * Link in a new blame entry to the scoreboard. Entries that cover the
554 * same line range have been removed from the scoreboard previously.
555 */
556 static void add_blame_entry(struct scoreboard *sb, struct blame_entry *e)
@@ -1392,7 +1392,7 @@ static void found_guilty_entry(struct blame_entry *ent)
1392
1393 /*
1394 * The main loop -- while the scoreboard has lines whose true origin
1395 - * is still unknown, pick one brame_entry, and allow its current
1395 + * is still unknown, pick one blame_entry, and allow its current
1396 * suspect to pass blames to its parents.
1397 */
1398 static void assign_blame(struct scoreboard *sb, struct rev_info *revs, int opt)
@@ -2001,7 +2001,7 @@ int cmd_blame(int argc, const char **argv, const char *prefix)
2001 /*
2002 * We have collected options unknown to us in argv[1..unk]
2003 * which are to be passed to revision machinery if we are
2004 - * going to do the "bottom" procesing.
2004 + * going to do the "bottom" processing.
2005 *
2006 * The remaining are:
2007 *
builtin-branch.c
+1 -1
@@ -364,7 +364,7 @@ static void rename_branch(const char *oldname, const char *newname, int force)
364 unsigned char sha1[20];
365
366 if (!oldname)
367 - die("cannot rename the curren branch while not on any.");
367 + die("cannot rename the current branch while not on any.");
368
369 if (snprintf(oldref, sizeof(oldref), "refs/heads/%s", oldname) > sizeof(oldref))
370 die("Old branchname too long");
builtin-for-each-ref.c
+1 -1
@@ -135,7 +135,7 @@ static const char *find_next(const char *cp)
135 while (*cp) {
136 if (*cp == '%') {
137 /* %( is the start of an atom;
138 - * %% is a quoteed per-cent.
138 + * %% is a quoted per-cent.
139 */
140 if (cp[1] == '(')
141 return cp;
builtin-fsck.c
+1 -1
@@ -117,7 +117,7 @@ static void check_unreachable_object(struct object *obj)
117
118 /*
119 * "!used" means that nothing at all points to it, including
120 - * other unreacahble objects. In other words, it's the "tip"
120 + * other unreachable objects. In other words, it's the "tip"
121 * of some set of unreachable objects, usually a commit that
122 * got dropped.
123 *
daemon.c
+1 -1
@@ -408,7 +408,7 @@ static void make_service_overridable(const char *name, int ena) {
408
409 /*
410 * Separate the "extra args" information as supplied by the client connection.
411 - * Any resulting data is squirrelled away in the given interpolation table.
411 + * Any resulting data is squirreled away in the given interpolation table.
412 */
413 static void parse_extra_args(struct interp *table, char *extra_args, int buflen)
414 {
git-merge-resolve.sh
+1 -1
@@ -3,7 +3,7 @@
3 # Copyright (c) 2005 Linus Torvalds
4 # Copyright (c) 2005 Junio C Hamano
5 #
6 -# Resolve two trees, using enhancd multi-base read-tree.
6 +# Resolve two trees, using enhanced multi-base read-tree.
7
8 # The first parameters up to -- are merge bases; the rest are heads.
9 bases= head= remotes= sep_seen=
git-quiltimport.sh
+1 -1
@@ -59,7 +59,7 @@ if ! [ -d "$QUILT_PATCHES" ] ; then
59 exit 1
60 fi
61
62 -# Temporay directories
62 +# Temporary directories
63 tmp_dir=.dotest
64 tmp_msg="$tmp_dir/msg"
65 tmp_patch="$tmp_dir/patch"
gitweb/gitweb.perl
+1 -1
@@ -834,7 +834,7 @@ sub file_type_long {
834
835 ## ----------------------------------------------------------------------
836 ## functions returning short HTML fragments, or transforming HTML fragments
837 -## which don't beling to other sections
837 +## which don't belong to other sections
838
839 # format line of commit message.
840 sub format_log_line_html {
merge-recursive.c
+4 -4
@@ -386,7 +386,7 @@ struct rename
386 };
387
388 /*
389 - * Get information of all renames which occured between 'o_tree' and
389 + * Get information of all renames which occurred between 'o_tree' and
390 * 'tree'. We need the three trees in the merge ('o_tree', 'a_tree' and
391 * 'b_tree') to be able to associate the correct cache entries with
392 * the rename information. 'tree' is always equal to either a_tree or b_tree.
@@ -1175,7 +1175,7 @@ static struct commit_list *reverse_commit_list(struct commit_list *list)
1175
1176 /*
1177 * Merge the commits h1 and h2, return the resulting virtual
1178 - * commit object and a flag indicating the cleaness of the merge.
1178 + * commit object and a flag indicating the cleanness of the merge.
1179 */
1180 static int merge(struct commit *h1,
1181 struct commit *h2,
@@ -1222,8 +1222,8 @@ static int merge(struct commit *h1,
1222 /*
1223 * When the merge fails, the result contains files
1224 * with conflict markers. The cleanness flag is
1225 - * ignored, it was never acutally used, as result of
1226 - * merge_trees has always overwritten it: the commited
1225 + * ignored, it was never actually used, as result of
1226 + * merge_trees has always overwritten it: the committed
1227 * "conflicts" were already resolved.
1228 */
1229 discard_cache();
perl/Git.pm
+1 -1
@@ -354,7 +354,7 @@ sub command_input_pipe {
354 =item command_close_pipe ( PIPE [, CTX ] )
355
356 Close the C<PIPE> as returned from C<command_*_pipe()>, checking
357 -whether the command finished successfuly. The optional C<CTX> argument
357 +whether the command finished successfully. The optional C<CTX> argument
358 is required if you want to see the command name in the error message,
359 and it is the second value returned by C<command_*_pipe()> when
360 called in array context. The call idiom is:
perl/private-Error.pm
+1 -1
@@ -781,7 +781,7 @@ that is a plain string. (Unless C<$Error::ObjectifyCallback> is modified)
781
782 This variable holds a reference to a subroutine that converts errors that
783 are plain strings to objects. It is used by Error.pm to convert textual
784 -errors to objects, and can be overrided by the user.
784 +errors to objects, and can be overridden by the user.
785
786 It accepts a single argument which is a hash reference to named parameters.
787 Currently the only named parameter passed is C<'text'> which is the text
ppc/sha1ppc.S
+3 -3
@@ -18,7 +18,7 @@
18 * %r0 - temp
19 * %r3 - argument (pointer to 5 words of SHA state)
20 * %r4 - argument (pointer to data to hash)
21 - * %r5 - Contant K in SHA round (initially number of blocks to hash)
21 + * %r5 - Constant K in SHA round (initially number of blocks to hash)
22 * %r6-%r10 - Working copies of SHA variables A..E (actually E..A order)
23 * %r11-%r26 - Data being hashed W[].
24 * %r27-%r31 - Previous copies of A..E, for final add back.
@@ -48,7 +48,7 @@
48 * E += ROTL(A,5) + F(B,C,D) + W[i] + K; B = ROTL(B,30)
49 * Then the variables are renamed: (A,B,C,D,E) = (E,A,B,C,D).
50 *
51 - * Every 20 rounds, the function F() and the contant K changes:
51 + * Every 20 rounds, the function F() and the constant K changes:
52 * - 20 rounds of f0(b,c,d) = "bit wise b ? c : d" = (^b & d) + (b & c)
53 * - 20 rounds of f1(b,c,d) = b^c^d = (b^d)^c
54 * - 20 rounds of f2(b,c,d) = majority(b,c,d) = (b&d) + ((b^d)&c)
@@ -57,7 +57,7 @@
57 * These are all scheduled for near-optimal performance on a G4.
58 * The G4 is a 3-issue out-of-order machine with 3 ALUs, but it can only
59 * *consider* starting the oldest 3 instructions per cycle. So to get
60 - * maximum performace out of it, you have to treat it as an in-order
60 + * maximum performance out of it, you have to treat it as an in-order
61 * machine. Which means interleaving the computation round t with the
62 * computation of W[t+4].
63 *
sha1_file.c
+1 -1
@@ -1163,7 +1163,7 @@ static unsigned long unpack_object_header(struct packed_git *p,
1163
1164 /* use_pack() assures us we have [base, base + 20) available
1165 * as a range that we can look at at. (Its actually the hash
1166 - * size that is assurred.) With our object header encoding
1166 + * size that is assured.) With our object header encoding
1167 * the maximum deflated object size is 2^137, which is just
1168 * insane, so we know won't exceed what we have been given.
1169 */
t/t1004-read-tree-m-u-wf.sh
+1 -1
@@ -87,7 +87,7 @@ test_expect_success 'three-way not complaining on an untracked path in both' '
87 git-read-tree -m -u branch-point master side
88 '
89
90 -test_expect_success 'three-way not cloberring a working tree file' '
90 +test_expect_success 'three-way not clobbering a working tree file' '
91
92 git reset --hard &&
93 rm -f file2 subdir/file2 file3 subdir/file3 &&
t/t1020-subdirectory.sh
+3 -3
@@ -106,21 +106,21 @@ test_expect_success 'read-tree' '
106 cmp ../one ../original.one
107 '
108
109 -test_expect_success 'no file/rev ambuguity check inside .git' '
109 +test_expect_success 'no file/rev ambiguity check inside .git' '
110 cd $HERE &&
111 git commit -a -m 1 &&
112 cd $HERE/.git &&
113 git show -s HEAD
114 '
115
116 -test_expect_success 'no file/rev ambuguity check inside a bare repo' '
116 +test_expect_success 'no file/rev ambiguity check inside a bare repo' '
117 cd $HERE &&
118 git clone -s --bare .git foo.git &&
119 cd foo.git && GIT_DIR=. git show -s HEAD
120 '
121
122 # This still does not work as it should...
123 -: test_expect_success 'no file/rev ambuguity check inside a bare repo' '
123 +: test_expect_success 'no file/rev ambiguity check inside a bare repo' '
124 cd $HERE &&
125 git clone -s --bare .git foo.git &&
126 cd foo.git && git show -s HEAD
t/t3800-mktag.sh
+2 -2
@@ -172,7 +172,7 @@ EOF
172 check_verify_failure 'verify tag-name check'
173
174 ############################################################
175 -# 11. tagger line lable check #1
175 +# 11. tagger line label check #1
176
177 cat >tag.sig <<EOF
178 object $head
@@ -187,7 +187,7 @@ EOF
187 check_verify_failure '"tagger" line label check #1'
188
189 ############################################################
190 -# 12. tagger line lable check #2
190 +# 12. tagger line label check #2
191
192 cat >tag.sig <<EOF
193 object $head
t/t5000-tar-tree.sh
+1 -1
@@ -10,7 +10,7 @@ commit id embedding:
10
11 The contents of the repository is compared to the extracted tar
12 archive. The repository contains simple text files, symlinks and a
13 - binary file (/bin/sh). Only pathes shorter than 99 characters are
13 + binary file (/bin/sh). Only paths shorter than 99 characters are
14 used.
15
16 git-tar-tree applies the commit date to every file in the archive it
t/t5600-clone-fail-cleanup.sh
+1 -1
@@ -36,7 +36,7 @@ test_expect_success \
36 'git-clone foo bar'
37
38 test_expect_success \
39 - 'successfull clone must leave the directory' \
39 + 'successful clone must leave the directory' \
40 'cd bar'
41
42 test_done
t/t9101-git-svn-props.sh
+1 -1
@@ -70,7 +70,7 @@ name='test svn:keywords ignoring'
70 test_expect_success "$name" \
71 'git checkout -b mybranch remotes/git-svn &&
72 echo Hi again >> kw.c &&
73 - git commit -a -m "test keywoards ignoring" &&
73 + git commit -a -m "test keywords ignoring" &&
74 git-svn set-tree remotes/git-svn..mybranch &&
75 git pull . remotes/git-svn'
76
templates/Makefile
+1 -1
@@ -6,7 +6,7 @@ prefix ?= $(HOME)
6 template_dir ?= $(prefix)/share/git-core/templates/
7 # DESTDIR=
8
9 -# Shell quote (do not use $(call) to accomodate ancient setups);
9 +# Shell quote (do not use $(call) to accommodate ancient setups);
10 DESTDIR_SQ = $(subst ','\'',$(DESTDIR))
11 template_dir_SQ = $(subst ','\'',$(template_dir))
12
templates/hooks--update
+1 -1
@@ -61,7 +61,7 @@ newrev_type=$(git-cat-file -t "$newrev")
61
62 case "$refname","$newrev_type" in
63 refs/tags/*,commit)
64 - # un-annoted tag
64 + # un-annotated tag
65 refname_type="tag"
66 short_refname=${refname##refs/tags/}
67 if [ $allowunannotated != "true" ]; then