{"thread":{"id":"6657","subject":"[PATCH] Assorted typo fixes","startedAt":"2007-02-04T04:49:16Z","lastAt":"2007-02-04T05:51:57Z","messageCount":2,"participants":["Pavel Roskin","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"33527","messageId":"20070204044916.9196.84265.stgit@dv.roinet.com","threadId":"6657","inReplyTo":null,"subject":"[PATCH] Assorted typo fixes","fromName":"Pavel Roskin","fromEmail":"proski@gnu.org","sentAt":"2007-02-04T04:49:16Z","receivedAt":"2007-02-04T04:49:16Z","isPatch":true,"sender":{"key":"proski@gnu.org","avatar":null},"body":"\n---\n\n Documentation/config.txt | 2 +-\n Documentation/diff-format.txt | 2 +-\n Documentation/git-send-pack.txt | 2 +-\n Documentation/git-svn.txt | 2 +-\n Documentation/gitk.txt | 2 +-\n Documentation/user-manual.txt | 10 +++++-----\n builtin-blame.c | 6 +++---\n builtin-branch.c | 2 +-\n builtin-for-each-ref.c | 2 +-\n builtin-fsck.c | 2 +-\n daemon.c | 2 +-\n git-merge-resolve.sh | 2 +-\n git-quiltimport.sh | 2 +-\n gitweb/gitweb.perl | 2 +-\n merge-recursive.c | 8 ++++----\n perl/Git.pm | 2 +-\n perl/private-Error.pm | 2 +-\n ppc/sha1ppc.S | 6 +++---\n sha1_file.c | 2 +-\n t/t1004-read-tree-m-u-wf.sh | 2 +-\n t/t1020-subdirectory.sh | 6 +++---\n t/t3800-mktag.sh | 4 ++--\n t/t5000-tar-tree.sh | 2 +-\n t/t5600-clone-fail-cleanup.sh | 2 +-\n t/t9101-git-svn-props.sh | 2 +-\n templates/Makefile | 2 +-\n templates/hooks--update | 2 +-\n 27 files changed, 41 insertions(+), 41 deletions(-)\n\ndiff --git a/Documentation/config.txt b/Documentation/config.txt\nindex e5e019f..4e650af 100644\n--- a/Documentation/config.txt\n+++ b/Documentation/config.txt\n@@ -39,7 +39,7 @@ in the section header, like in example below:\n \n Subsection names can contain any characters except newline (doublequote\n '`\"`' and backslash have to be escaped as '`\\\"`' and '`\\\\`',\n-respecitvely) and are case sensitive. Section header cannot span multiple\n+respectively) and are case sensitive. Section header cannot span multiple\n lines. Variables may belong directly to a section or to a given subsection.\n You can have `[section]` if you have `[section \"subsection\"]`, but you\n don't need to.\ndiff --git a/Documentation/diff-format.txt b/Documentation/diff-format.txt\nindex 883c1bb..378e72f 100644\n--- a/Documentation/diff-format.txt\n+++ b/Documentation/diff-format.txt\n@@ -159,7 +159,7 @@ or like this (when '--cc' option is used):\n deleted file mode ,\n +\n The `mode ,..` line appears only if at least one of\n-the is diferent from the rest. Extended headers with\n+the is different from the rest. Extended headers with\n information about detected contents movement (renames and\n copying detection) are designed to work with diff of two\n and are not used by combined diff format.\ndiff --git a/Documentation/git-send-pack.txt b/Documentation/git-send-pack.txt\nindex 2f6267c..205bfd2 100644\n--- a/Documentation/git-send-pack.txt\n+++ b/Documentation/git-send-pack.txt\n@@ -3,7 +3,7 @@ git-send-pack(1)\n \n NAME\n ----\n-git-send-pack - Push objects over git protocol to another reposiotory\n+git-send-pack - Push objects over git protocol to another repository\n \n \n SYNOPSIS\ndiff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt\nindex aea4a6b..6ce6a39 100644\n--- a/Documentation/git-svn.txt\n+++ b/Documentation/git-svn.txt\n@@ -133,7 +133,7 @@ manually joining branches on commit.\n \n 'multi-init'::\n \tThis command supports git-svnimport-like command-line syntax for\n-\timporting repositories that are layed out as recommended by the\n+\timporting repositories that are laid out as recommended by the\n \tSVN folks. This is a bit more tolerant than the git-svnimport\n \tcommand-line syntax and doesn't require the user to figure out\n \twhere the repository URL ends and where the repository path\ndiff --git a/Documentation/gitk.txt b/Documentation/gitk.txt\nindex 5bdaa60..48c5894 100644\n--- a/Documentation/gitk.txt\n+++ b/Documentation/gitk.txt\n@@ -54,7 +54,7 @@ frequently used options.\n \n \tLimit commits to the ones touching files in the given paths. Note, to\n \tavoid ambiguity wrt. revision names use \"--\" to separate the paths\n-\tfrom any preceeding options.\n+\tfrom any preceding options.\n \n Examples\n --------\ndiff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt\nindex 6576625..c5e9ea8 100644\n--- a/Documentation/user-manual.txt\n+++ b/Documentation/user-manual.txt\n@@ -425,8 +425,8 @@ if commit X is an ancestor of commit Y. Equivalently, you could say\n that Y is a descendent of X, or that there is a chain of parents\n leading from commit Y to commit X.\n \n-Undestanding history: History diagrams\n-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n+Understanding history: History diagrams\n+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n \n We will sometimes represent git history using diagrams like the one\n below. Commits are shown as \"o\", and the links between them with\n@@ -806,7 +806,7 @@ display options.\n \n Note that git log starts with the most recent commit and works\n backwards through the parents; however, since git history can contain\n-multiple independant lines of development, the particular order that\n+multiple independent lines of development, the particular order that\n commits are listed in may be somewhat arbitrary.\n \n Generating diffs\n@@ -1075,7 +1075,7 @@ $ git commit\n -------------------------------------------------\n \n and git will prompt you for a commit message and then create the new\n-commmit. Check to make sure it looks like what you expected with\n+commit. Check to make sure it looks like what you expected with\n \n -------------------------------------------------\n $ git show\n@@ -2953,7 +2953,7 @@ Include cross-references to the glossary, where appropriate.\n Document shallow clones? See draft 1.5.0 release notes for some\n documentation.\n \n-Add a sectin on working with other version control systems, including\n+Add a section on working with other version control systems, including\n CVS, Subversion, and just imports of series of release tarballs.\n \n More details on gitweb?\ndiff --git a/builtin-blame.c b/builtin-blame.c\nindex 3033e9b..1c21204 100644\n--- a/builtin-blame.c\n+++ b/builtin-blame.c\n@@ -550,7 +550,7 @@ static void free_patch(struct patch *p)\n }\n \n /*\n- * Link in a new blame entry to the scorebord. Entries that cover the\n+ * Link in a new blame entry to the scoreboard. Entries that cover the\n * same line range have been removed from the scoreboard previously.\n */\n static void add_blame_entry(struct scoreboard *sb, struct blame_entry *e)\n@@ -1392,7 +1392,7 @@ static void found_guilty_entry(struct blame_entry *ent)\n \n /*\n * The main loop -- while the scoreboard has lines whose true origin\n- * is still unknown, pick one brame_entry, and allow its current\n+ * is still unknown, pick one blame_entry, and allow its current\n * suspect to pass blames to its parents.\n */\n static void assign_blame(struct scoreboard *sb, struct rev_info *revs, int opt)\n@@ -2001,7 +2001,7 @@ int cmd_blame(int argc, const char **argv, const char *prefix)\n \t/*\n \t * We have collected options unknown to us in argv[1..unk]\n \t * which are to be passed to revision machinery if we are\n-\t * going to do the \"bottom\" procesing.\n+\t * going to do the \"bottom\" processing.\n \t *\n \t * The remaining are:\n \t *\ndiff --git a/builtin-branch.c b/builtin-branch.c\nindex d60690b..35886c9 100644\n--- a/builtin-branch.c\n+++ b/builtin-branch.c\n@@ -358,7 +358,7 @@ static void rename_branch(const char *oldname, const char *newname, int force)\n \tunsigned char sha1[20];\n \n \tif (!oldname)\n-\t\tdie(\"cannot rename the curren branch while not on any.\");\n+\t\tdie(\"cannot rename the current branch while not on any.\");\n \n \tif (snprintf(oldref, sizeof(oldref), \"refs/heads/%s\", oldname) > sizeof(oldref))\n \t\tdie(\"Old branchname too long\");\ndiff --git a/builtin-for-each-ref.c b/builtin-for-each-ref.c\nindex 9d5f266..16c785f 100644\n--- a/builtin-for-each-ref.c\n+++ b/builtin-for-each-ref.c\n@@ -135,7 +135,7 @@ static const char *find_next(const char *cp)\n \twhile (*cp) {\n \t\tif (*cp == '%') {\n \t\t\t/* %( is the start of an atom;\n-\t\t\t * %% is a quoteed per-cent.\n+\t\t\t * %% is a quoted per-cent.\n \t\t\t */\n \t\t\tif (cp[1] == '(')\n \t\t\t\treturn cp;\ndiff --git a/builtin-fsck.c b/builtin-fsck.c\nindex fec1cbd..f6f1967 100644\n--- a/builtin-fsck.c\n+++ b/builtin-fsck.c\n@@ -117,7 +117,7 @@ static void check_unreachable_object(struct object *obj)\n \n \t/*\n \t * \"!used\" means that nothing at all points to it, including\n-\t * other unreacahble objects. In other words, it's the \"tip\"\n+\t * other unreachable objects. In other words, it's the \"tip\"\n \t * of some set of unreachable objects, usually a commit that\n \t * got dropped.\n \t *\ndiff --git a/daemon.c b/daemon.c\nindex 9590372..2a20ca5 100644\n--- a/daemon.c\n+++ b/daemon.c\n@@ -408,7 +408,7 @@ static void make_service_overridable(const char *name, int ena) {\n \n /*\n * Separate the \"extra args\" information as supplied by the client connection.\n- * Any resulting data is squirrelled away in the given interpolation table.\n+ * Any resulting data is squirreled away in the given interpolation table.\n */\n static void parse_extra_args(struct interp *table, char *extra_args, int buflen)\n {\ndiff --git a/git-merge-resolve.sh b/git-merge-resolve.sh\nindex 0a8ef21..75e1de4 100755\n--- a/git-merge-resolve.sh\n+++ b/git-merge-resolve.sh\n@@ -3,7 +3,7 @@\n # Copyright (c) 2005 Linus Torvalds\n # Copyright (c) 2005 Junio C Hamano\n #\n-# Resolve two trees, using enhancd multi-base read-tree.\n+# Resolve two trees, using enhanced multi-base read-tree.\n \n # The first parameters up to -- are merge bases; the rest are heads.\n bases= head= remotes= sep_seen=\ndiff --git a/git-quiltimport.sh b/git-quiltimport.sh\nindex 2ae1f20..671a5ff 100755\n--- a/git-quiltimport.sh\n+++ b/git-quiltimport.sh\n@@ -59,7 +59,7 @@ if ! [ -d \"$QUILT_PATCHES\" ] ; then\n \texit 1\n fi\n \n-# Temporay directories\n+# Temporary directories\n tmp_dir=.dotest\n tmp_msg=\"$tmp_dir/msg\"\n tmp_patch=\"$tmp_dir/patch\"\ndiff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl\nindex b606c1d..a2076a6 100755\n--- a/gitweb/gitweb.perl\n+++ b/gitweb/gitweb.perl\n@@ -834,7 +834,7 @@ sub file_type_long {\n \n ## ----------------------------------------------------------------------\n ## functions returning short HTML fragments, or transforming HTML fragments\n-## which don't beling to other sections\n+## which don't belong to other sections\n \n # format line of commit message.\n sub format_log_line_html {\ndiff --git a/merge-recursive.c b/merge-recursive.c\nindex fa320eb..a5e6845 100644\n--- a/merge-recursive.c\n+++ b/merge-recursive.c\n@@ -386,7 +386,7 @@ struct rename\n };\n \n /*\n- * Get information of all renames which occured between 'o_tree' and\n+ * Get information of all renames which occurred between 'o_tree' and\n * 'tree'. We need the three trees in the merge ('o_tree', 'a_tree' and\n * 'b_tree') to be able to associate the correct cache entries with\n * the rename information. 'tree' is always equal to either a_tree or b_tree.\n@@ -1175,7 +1175,7 @@ static struct commit_list *reverse_commit_list(struct commit_list *list)\n \n /*\n * Merge the commits h1 and h2, return the resulting virtual\n- * commit object and a flag indicating the cleaness of the merge.\n+ * commit object and a flag indicating the cleanness of the merge.\n */\n static int merge(struct commit *h1,\n \t\t struct commit *h2,\n@@ -1222,8 +1222,8 @@ static int merge(struct commit *h1,\n \t\t/*\n \t\t * When the merge fails, the result contains files\n \t\t * with conflict markers. The cleanness flag is\n-\t\t * ignored, it was never acutally used, as result of\n-\t\t * merge_trees has always overwritten it: the commited\n+\t\t * ignored, it was never actually used, as result of\n+\t\t * merge_trees has always overwritten it: the committed\n \t\t * \"conflicts\" were already resolved.\n \t\t */\n \t\tdiscard_cache();\ndiff --git a/perl/Git.pm b/perl/Git.pm\nindex 5d1ccaa..f2c156c 100644\n--- a/perl/Git.pm\n+++ b/perl/Git.pm\n@@ -354,7 +354,7 @@ sub command_input_pipe {\n =item command_close_pipe ( PIPE [, CTX ] )\n \n Close the C as returned from C, checking\n-whether the command finished successfuly. The optional C argument\n+whether the command finished successfully. The optional C argument\n is required if you want to see the command name in the error message,\n and it is the second value returned by C when\n called in array context. The call idiom is:\ndiff --git a/perl/private-Error.pm b/perl/private-Error.pm\nindex 8fff866..11e9cd9 100644\n--- a/perl/private-Error.pm\n+++ b/perl/private-Error.pm\n@@ -781,7 +781,7 @@ that is a plain string. (Unless C<$Error::ObjectifyCallback> is modified)\n \n This variable holds a reference to a subroutine that converts errors that\n are plain strings to objects. It is used by Error.pm to convert textual\n-errors to objects, and can be overrided by the user.\n+errors to objects, and can be overridden by the user.\n \n It accepts a single argument which is a hash reference to named parameters.\n Currently the only named parameter passed is C<'text'> which is the text\ndiff --git a/ppc/sha1ppc.S b/ppc/sha1ppc.S\nindex 140cb53..f132696 100644\n--- a/ppc/sha1ppc.S\n+++ b/ppc/sha1ppc.S\n@@ -18,7 +18,7 @@\n * %r0 - temp\n * %r3 - argument (pointer to 5 words of SHA state)\n * %r4 - argument (pointer to data to hash)\n- * %r5 - Contant K in SHA round (initially number of blocks to hash)\n+ * %r5 - Constant K in SHA round (initially number of blocks to hash)\n * %r6-%r10 - Working copies of SHA variables A..E (actually E..A order)\n * %r11-%r26 - Data being hashed W[].\n * %r27-%r31 - Previous copies of A..E, for final add back.\n@@ -48,7 +48,7 @@\n * E += ROTL(A,5) + F(B,C,D) + W[i] + K; B = ROTL(B,30)\n * Then the variables are renamed: (A,B,C,D,E) = (E,A,B,C,D).\n *\n- * Every 20 rounds, the function F() and the contant K changes:\n+ * Every 20 rounds, the function F() and the constant K changes:\n * - 20 rounds of f0(b,c,d) = \"bit wise b ? c : d\" = (^b & d) + (b & c)\n * - 20 rounds of f1(b,c,d) = b^c^d = (b^d)^c\n * - 20 rounds of f2(b,c,d) = majority(b,c,d) = (b&d) + ((b^d)&c)\n@@ -57,7 +57,7 @@\n * These are all scheduled for near-optimal performance on a G4.\n * The G4 is a 3-issue out-of-order machine with 3 ALUs, but it can only\n * *consider* starting the oldest 3 instructions per cycle. So to get\n- * maximum performace out of it, you have to treat it as an in-order\n+ * maximum performance out of it, you have to treat it as an in-order\n * machine. Which means interleaving the computation round t with the\n * computation of W[t+4].\n *\ndiff --git a/sha1_file.c b/sha1_file.c\nindex 45e410e..1526a28 100644\n--- a/sha1_file.c\n+++ b/sha1_file.c\n@@ -1163,7 +1163,7 @@ static unsigned long unpack_object_header(struct packed_git *p,\n \n \t/* use_pack() assures us we have [base, base + 20) available\n \t * as a range that we can look at at. (Its actually the hash\n-\t * size that is assurred.) With our object header encoding\n+\t * size that is assured.) With our object header encoding\n \t * the maximum deflated object size is 2^137, which is just\n \t * insane, so we know won't exceed what we have been given.\n \t */\ndiff --git a/t/t1004-read-tree-m-u-wf.sh b/t/t1004-read-tree-m-u-wf.sh\nindex 4f664f6..c11420a 100755\n--- a/t/t1004-read-tree-m-u-wf.sh\n+++ b/t/t1004-read-tree-m-u-wf.sh\n@@ -87,7 +87,7 @@ test_expect_success 'three-way not complaining on an untracked path in both' '\n \tgit-read-tree -m -u branch-point master side\n '\n \n-test_expect_success 'three-way not cloberring a working tree file' '\n+test_expect_success 'three-way not clobbering a working tree file' '\n \n \tgit reset --hard &&\n \trm -f file2 subdir/file2 file3 subdir/file3 &&\ndiff --git a/t/t1020-subdirectory.sh b/t/t1020-subdirectory.sh\nindex c090c96..1e8f9e5 100755\n--- a/t/t1020-subdirectory.sh\n+++ b/t/t1020-subdirectory.sh\n@@ -106,21 +106,21 @@ test_expect_success 'read-tree' '\n \tcmp ../one ../original.one\n '\n \n-test_expect_success 'no file/rev ambuguity check inside .git' '\n+test_expect_success 'no file/rev ambiguity check inside .git' '\n \tcd $HERE &&\n \tgit commit -a -m 1 &&\n \tcd $HERE/.git &&\n \tgit show -s HEAD\n '\n \n-test_expect_success 'no file/rev ambuguity check inside a bare repo' '\n+test_expect_success 'no file/rev ambiguity check inside a bare repo' '\n \tcd $HERE &&\n \tgit clone -s --bare .git foo.git &&\n \tcd foo.git && GIT_DIR=. git show -s HEAD\n '\n \n # This still does not work as it should...\n-: test_expect_success 'no file/rev ambuguity check inside a bare repo' '\n+: test_expect_success 'no file/rev ambiguity check inside a bare repo' '\n \tcd $HERE &&\n \tgit clone -s --bare .git foo.git &&\n \tcd foo.git && git show -s HEAD\ndiff --git a/t/t3800-mktag.sh b/t/t3800-mktag.sh\nindex ede4d42..7c7e433 100755\n--- a/t/t3800-mktag.sh\n+++ b/t/t3800-mktag.sh\n@@ -172,7 +172,7 @@ EOF\n check_verify_failure 'verify tag-name check'\n \n ############################################################\n-# 11. tagger line lable check #1\n+# 11. tagger line label check #1\n \n cat >tag.sig <tag.sig <> kw.c &&\n-\tgit commit -a -m \"test keywoards ignoring\" &&\n+\tgit commit -a -m \"test keywords ignoring\" &&\n \tgit-svn set-tree remotes/git-svn..mybranch &&\n \tgit pull . remotes/git-svn'\n \ndiff --git a/templates/Makefile b/templates/Makefile\nindex 9e1ae1a..0eeee43 100644\n--- a/templates/Makefile\n+++ b/templates/Makefile\n@@ -6,7 +6,7 @@ prefix ?= $(HOME)\n template_dir ?= $(prefix)/share/git-core/templates/\n # DESTDIR=\n \n-# Shell quote (do not use $(call) to accomodate ancient setups);\n+# Shell quote (do not use $(call) to accommodate ancient setups);\n DESTDIR_SQ = $(subst ','\\'',$(DESTDIR))\n template_dir_SQ = $(subst ','\\'',$(template_dir))\n \ndiff --git a/templates/hooks--update b/templates/hooks--update\nindex 4bd9d96..d4253cb 100644\n--- a/templates/hooks--update\n+++ b/templates/hooks--update\n@@ -61,7 +61,7 @@ newrev_type=$(git-cat-file -t \"$newrev\")\n \n case \"$refname\",\"$newrev_type\" in\n \trefs/tags/*,commit)\n-\t\t# un-annoted tag\n+\t\t# un-annotated tag\n \t\trefname_type=\"tag\"\n \t\tshort_refname=${refname##refs/tags/}\n \t\tif [ $allowunannotated != \"true\" ]; then\n"},{"id":"33536","messageId":"7vveiixyf6.fsf@assigned-by-dhcp.cox.net","threadId":"6657","inReplyTo":"20070204044916.9196.84265.stgit@dv.roinet.com","subject":"Re: [PATCH] Assorted typo fixes","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2007-02-04T05:51:57Z","receivedAt":"2007-02-04T05:51:57Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Thanks. Shows that we cannot spell X-<.\n"}]}