{"thread":{"id":"22516","subject":"[PATCH] Typofixes outside documentation area","startedAt":"2010-02-04T05:31:05Z","lastAt":"2010-02-04T10:59:51Z","messageCount":3,"participants":["Junio C Hamano","Peter Krefting","Thomas Rast"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"133586","messageId":"7v636dr2hy.fsf@alter.siamese.dyndns.org","threadId":"22516","inReplyTo":null,"subject":"[PATCH] Typofixes outside documentation area","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2010-02-04T05:31:05Z","receivedAt":"2010-02-04T05:31:05Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"    begining -> beginning\n    canonicalizations -> canonicalization\n    comand -> command\n    dewrapping -> unwrapping\n    dirtyness -> dirtiness\n    DISCLAMER -> DISCLAIMER\n    explicitely -> explicitly\n    feeded -> fed\n    impiled -> implied\n    madatory -> mandatory\n    mimick -> mimic\n    preceeding -> preceding\n    reqeuest -> request\n    substition -> substitution\n\nSigned-off-by: Junio C Hamano <gitster@pobox.com>\n---\n builtin-apply.c                             |    2 +-\n builtin-cat-file.c                          |    5 +++--\n builtin-log.c                               |    2 +-\n builtin-prune.c                             |    2 +-\n builtin-show-branch.c                       |    2 +-\n compat/win32/pthread.c                      |    2 +-\n connect.c                                   |    2 +-\n contrib/fast-import/import-directories.perl |    2 +-\n daemon.c                                    |    2 +-\n diff.c                                      |    2 +-\n levenshtein.h                               |    2 +-\n path.c                                      |    2 +-\n perl/Git.pm                                 |    4 ++--\n refs.c                                      |    2 +-\n setup.c                                     |    2 +-\n test-chmtime.c                              |    2 +-\n transport-helper.c                          |    2 +-\n 17 files changed, 20 insertions(+), 19 deletions(-)\n\ndiff --git a/builtin-apply.c b/builtin-apply.c\nindex 2a1004d..3af4ae0 100644\n--- a/builtin-apply.c\n+++ b/builtin-apply.c\n@@ -2006,7 +2006,7 @@ static int find_pos(struct image *img,\n \t\treturn -1;\n \n \t/*\n-\t * If match_begining or match_end is specified, there is no\n+\t * If match_beginning or match_end is specified, there is no\n \t * point starting from a wrong line that will never match and\n \t * wander around and wait for a match at the specified end.\n \t */\ndiff --git a/builtin-cat-file.c b/builtin-cat-file.c\nindex 5906842..a933eaa 100644\n--- a/builtin-cat-file.c\n+++ b/builtin-cat-file.c\n@@ -219,9 +219,10 @@ int cmd_cat_file(int argc, const char **argv, const char *prefix)\n \t\t\t    \"exit with zero when there's no error\", 'e'),\n \t\tOPT_SET_INT('p', NULL, &opt, \"pretty-print object's content\", 'p'),\n \t\tOPT_SET_INT(0, \"batch\", &batch,\n-\t\t\t    \"show info and content of objects feeded on stdin\", BATCH),\n+\t\t\t    \"show info and content of objects fed from the standard input\",\n+\t\t\t    BATCH),\n \t\tOPT_SET_INT(0, \"batch-check\", &batch,\n-\t\t\t    \"show info about objects feeded on stdin\",\n+\t\t\t    \"show info about objects fed from the standard input\",\n \t\t\t    BATCH_CHECK),\n \t\tOPT_END()\n \t};\ndiff --git a/builtin-log.c b/builtin-log.c\nindex 8d16832..e0d5caa 100644\n--- a/builtin-log.c\n+++ b/builtin-log.c\n@@ -1089,7 +1089,7 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)\n \n \t/*\n \t * We cannot move this anywhere earlier because we do want to\n-\t * know if --root was given explicitly from the comand line.\n+\t * know if --root was given explicitly from the command line.\n \t */\n \trev.show_root_diff = 1;\n \ndiff --git a/builtin-prune.c b/builtin-prune.c\nindex 8459aec..4675f60 100644\n--- a/builtin-prune.c\n+++ b/builtin-prune.c\n@@ -106,7 +106,7 @@ static void prune_object_dir(const char *path)\n /*\n  * Write errors (particularly out of space) can result in\n  * failed temporary packs (and more rarely indexes and other\n- * files begining with \"tmp_\") accumulating in the object\n+ * files beginning with \"tmp_\") accumulating in the object\n  * and the pack directories.\n  */\n static void remove_temporary_files(const char *path)\ndiff --git a/builtin-show-branch.c b/builtin-show-branch.c\nindex 9f13caa..35a709e 100644\n--- a/builtin-show-branch.c\n+++ b/builtin-show-branch.c\n@@ -567,7 +567,7 @@ static int git_show_branch_config(const char *var, const char *value, void *cb)\n \t\t\treturn config_error_nonbool(var);\n \t\t/*\n \t\t * default_arg is now passed to parse_options(), so we need to\n-\t\t * mimick the real argv a bit better.\n+\t\t * mimic the real argv a bit better.\n \t\t */\n \t\tif (!default_num) {\n \t\t\tdefault_alloc = 20;\ndiff --git a/compat/win32/pthread.c b/compat/win32/pthread.c\nindex 5fc1670..0f949fc 100644\n--- a/compat/win32/pthread.c\n+++ b/compat/win32/pthread.c\n@@ -1,7 +1,7 @@\n /*\n  * Copyright (C) 2009 Andrzej K. Haczewski <ahaczewski@gmail.com>\n  *\n- * DISCLAMER: The implementation is Git-specific, it is subset of original\n+ * DISCLAIMER: The implementation is Git-specific, it is subset of original\n  * Pthreads API, without lots of other features that Git doesn't use.\n  * Git also makes sure that the passed arguments are valid, so there's\n  * no need for double-checking.\ndiff --git a/connect.c b/connect.c\nindex 20054e4..a37cf6a 100644\n--- a/connect.c\n+++ b/connect.c\n@@ -504,7 +504,7 @@ struct child_process *git_connect(int fd[2], const char *url_orig,\n \n \t/*\n \t * Don't do destructive transforms with git:// as that\n-\t * protocol code does '[]' dewrapping of its own.\n+\t * protocol code does '[]' unwrapping of its own.\n \t */\n \tif (host[0] == '[') {\n \t\tend = strchr(host + 1, ']');\ndiff --git a/contrib/fast-import/import-directories.perl b/contrib/fast-import/import-directories.perl\nindex 5782d80..3a5da4a 100755\n--- a/contrib/fast-import/import-directories.perl\n+++ b/contrib/fast-import/import-directories.perl\n@@ -344,7 +344,7 @@ sub parsekeyvaluepair\n \n Key and value strings may be enclosed in quotes, in which case\n whitespace inside the quotes is preserved. Additionally, an equal\n-sign may be included in the key by preceeding it with a backslash.\n+sign may be included in the key by preceding it with a backslash.\n For example:\n \n  \"key1 \"=value1\ndiff --git a/daemon.c b/daemon.c\nindex 6c2bd97..3769b6f 100644\n--- a/daemon.c\n+++ b/daemon.c\n@@ -407,7 +407,7 @@ static void parse_host_and_port(char *hostport, char **host,\n \n \t\tend = strchr(hostport, ']');\n \t\tif (!end)\n-\t\t\tdie(\"Invalid reqeuest ('[' without ']')\");\n+\t\t\tdie(\"Invalid request ('[' without ']')\");\n \t\t*end = '\\0';\n \t\t*host = hostport + 1;\n \t\tif (!end[1])\ndiff --git a/diff.c b/diff.c\nindex 381cc8d..9038057 100644\n--- a/diff.c\n+++ b/diff.c\n@@ -3642,7 +3642,7 @@ static void diffcore_skip_stat_unmatch(struct diff_options *diffopt)\n \t\tstruct diff_filepair *p = q->queue[i];\n \n \t\t/*\n-\t\t * 1. Entries that come from stat info dirtyness\n+\t\t * 1. Entries that come from stat info dirtiness\n \t\t *    always have both sides (iow, not create/delete),\n \t\t *    one side of the object name is unknown, with\n \t\t *    the same mode and size.  Keep the ones that\ndiff --git a/levenshtein.h b/levenshtein.h\nindex 0173abe..4105bf3 100644\n--- a/levenshtein.h\n+++ b/levenshtein.h\n@@ -2,7 +2,7 @@\n #define LEVENSHTEIN_H\n \n int levenshtein(const char *string1, const char *string2,\n-\tint swap_penalty, int substition_penalty,\n+\tint swap_penalty, int substitution_penalty,\n \tint insertion_penalty, int deletion_penalty);\n \n #endif\ndiff --git a/path.c b/path.c\nindex 79aa104..e166d53 100644\n--- a/path.c\n+++ b/path.c\n@@ -610,7 +610,7 @@ int daemon_avoid_alias(const char *p)\n \t/*\n \t * This resurrects the belts and suspenders paranoia check by HPA\n \t * done in <435560F7.4080006@zytor.com> thread, now enter_repo()\n-\t * does not do getcwd() based path canonicalizations.\n+\t * does not do getcwd() based path canonicalization.\n \t *\n \t * sl becomes true immediately after seeing '/' and continues to\n \t * be true as long as dots continue after that without intervening\ndiff --git a/perl/Git.pm b/perl/Git.pm\nindex e8df55d..970fe43 100644\n--- a/perl/Git.pm\n+++ b/perl/Git.pm\n@@ -204,14 +204,14 @@ sub repository {\n \t\t\t$dir = $opts{Directory};\n \n \t\t\tunless (-d \"$dir/refs\" and -d \"$dir/objects\" and -e \"$dir/HEAD\") {\n-\t\t\t\t# Mimick git-rev-parse --git-dir error message:\n+\t\t\t\t# Mimic git-rev-parse --git-dir error message:\n \t\t\t\tthrow Error::Simple(\"fatal: Not a git repository: $dir\");\n \t\t\t}\n \t\t\tmy $search = Git->repository(Repository => $dir);\n \t\t\ttry {\n \t\t\t\t$search->command('symbolic-ref', 'HEAD');\n \t\t\t} catch Git::Error::Command with {\n-\t\t\t\t# Mimick git-rev-parse --git-dir error message:\n+\t\t\t\t# Mimic git-rev-parse --git-dir error message:\n \t\t\t\tthrow Error::Simple(\"fatal: Not a git repository: $dir\");\n \t\t\t}\n \ndiff --git a/refs.c b/refs.c\nindex 503a8c2..f3fcbe0 100644\n--- a/refs.c\n+++ b/refs.c\n@@ -706,7 +706,7 @@ int for_each_glob_ref_in(each_ref_fn fn, const char *pattern,\n \n \thas_glob_specials = strpbrk(pattern, \"?*[\");\n \tif (!has_glob_specials) {\n-\t\t/* Append impiled '/' '*' if not present. */\n+\t\t/* Append implied '/' '*' if not present. */\n \t\tif (real_pattern.buf[real_pattern.len - 1] != '/')\n \t\t\tstrbuf_addch(&real_pattern, '/');\n \t\t/* No need to check for '*', there is none. */\ndiff --git a/setup.c b/setup.c\nindex 710e2f3..fac34f7 100644\n--- a/setup.c\n+++ b/setup.c\n@@ -206,7 +206,7 @@ int is_inside_work_tree(void)\n }\n \n /*\n- * set_work_tree() is only ever called if you set GIT_DIR explicitely.\n+ * set_work_tree() is only ever called if you set GIT_DIR explicitly.\n  * The old behaviour (which we retain here) is to set the work tree root\n  * to the cwd, unless overridden by the config, the command line, or\n  * GIT_WORK_TREE.\ndiff --git a/test-chmtime.c b/test-chmtime.c\nindex fe476cb..92713d1 100644\n--- a/test-chmtime.c\n+++ b/test-chmtime.c\n@@ -1,7 +1,7 @@\n /*\n  * This program can either change modification time of the given\n  * file(s) or just print it. The program does not change atime nor\n- * ctime (their values are explicitely preserved).\n+ * ctime (their values are explicitly preserved).\n  *\n  * The mtime can be changed to an absolute value:\n  *\ndiff --git a/transport-helper.c b/transport-helper.c\nindex 1077428..f822972 100644\n--- a/transport-helper.c\n+++ b/transport-helper.c\n@@ -171,7 +171,7 @@ static struct child_process *get_helper(struct transport *transport)\n \t\t} else if (!strcmp(capname, \"connect\")) {\n \t\t\tdata->connect = 1;\n \t\t} else if (mandatory) {\n-\t\t\tdie(\"Unknown madatory capability %s. This remote \"\n+\t\t\tdie(\"Unknown mandatory capability %s. This remote \"\n \t\t\t    \"helper probably needs newer version of Git.\\n\",\n \t\t\t    capname);\n \t\t}\n-- \n1.7.0.rc1.199.g9253ab\n"},{"id":"133595","messageId":"alpine.DEB.2.00.1002041032110.31053@ds9.cixit.se","threadId":"22516","inReplyTo":"7v636dr2hy.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH] Typofixes outside documentation area","fromName":"Peter Krefting","fromEmail":"peter@softwolves.pp.se","sentAt":"2010-02-04T09:33:22Z","receivedAt":"2010-02-04T09:33:22Z","isPatch":true,"sender":{"key":"peter@softwolves.pp.se","avatar":"https://avatars.githubusercontent.com/u/990764?v=4"},"body":"Junio C Hamano:\n\n> diff --git a/contrib/fast-import/import-directories.perl b/contrib/fast-import/import-directories.perl\n> index 5782d80..3a5da4a 100755\n> --- a/contrib/fast-import/import-directories.perl\n> +++ b/contrib/fast-import/import-directories.perl\n> @@ -344,7 +344,7 @@ sub parsekeyvaluepair\n>\n> Key and value strings may be enclosed in quotes, in which case\n> whitespace inside the quotes is preserved. Additionally, an equal\n> -sign may be included in the key by preceeding it with a backslash.\n> +sign may be included in the key by preceding it with a backslash.\n> For example:\n>\n>  \"key1 \"=value1\n\nACKed, obviously.\n\n-- \n\\\\// Peter - http://www.softwolves.pp.se/\n"},{"id":"133598","messageId":"201002041159.51543.trast@student.ethz.ch","threadId":"22516","inReplyTo":"7v636dr2hy.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH] Typofixes outside documentation area","fromName":"Thomas Rast","fromEmail":"trast@student.ethz.ch","sentAt":"2010-02-04T10:59:51Z","receivedAt":"2010-02-04T10:59:51Z","isPatch":true,"sender":{"key":"tr@thomasrast.ch","avatar":"https://avatars.githubusercontent.com/u/153510?v=4"},"body":"On Thursday 04 February 2010 06:31:05 Junio C Hamano wrote:\n> diff --git a/levenshtein.h b/levenshtein.h\n> index 0173abe..4105bf3 100644\n> --- a/levenshtein.h\n> +++ b/levenshtein.h\n> @@ -2,7 +2,7 @@\n>  #define LEVENSHTEIN_H\n>  \n>  int levenshtein(const char *string1, const char *string2,\n> -\tint swap_penalty, int substition_penalty,\n> +\tint swap_penalty, int substitution_penalty,\n>  \tint insertion_penalty, int deletion_penalty);\n>  \n>  #endif\n\nTo save others the trouble of looking it up, too:\n\nThis does change the name of the parameter, but it's only the\ndeclaration.  The actual definition of the function starts with\n\n\tint levenshtein(const char *string1, const char *string2,\n\t\t\tint w, int s, int a, int d)\n\t{\n\nso it doesn't need a similar rename, and no uses of the parameter are\naffected.\n\nAFAICS all other changes are only in comments or strings and should be\nsafe.\n\n-- \nThomas Rast\ntrast@{inf,student}.ethz.ch\n"}]}