Re: [PATCH] Spelling fixes
Ville Skyttä writes: > Signed-off-by: Ville Skyttä > --- > Documentation/RelNotes/1.7.10.1.txt | 2 +- > Documentation/RelNotes/2.12.0.txt | 2 +- > Documentation/RelNotes/2.14.0.txt | 2 +- > Documentation/git-reset.txt | 2 +- > Documentation/git-submodule.txt | 2 +- > abspath.c | 2 +- > builtin/grep.c | 2 +- > compat/regex/regexec.c | 2 +- > contrib/hooks/multimail/git_multimail.py| 2 +- > contrib/mw-to-git/git-remote-mediawiki.perl | 2 +- > contrib/mw-to-git/t/README | 2 +- > gitweb/gitweb.perl | 4 ++-- > mailinfo.c | 16 > pathspec.c | 2 +- > perl/Git/I18N.pm| 2 +- > refs.h | 4 ++-- > send-pack.c | 2 +- > sha1dc/sha1.c | 2 +- > submodule.c | 4 ++-- > t/helper/test-strcmp-offset.c | 2 +- > t/t2203-add-intent.sh | 6 +++--- > t/t3070-wildmatch.sh| 2 +- > t/t4213-log-tabexpand.sh| 2 +- > t/t5614-clone-submodules-shallow.sh | 4 ++-- > t/t6120-describe.sh | 2 +- > t/t7412-submodule-absorbgitdirs.sh | 2 +- > t/t7413-submodule-is-active.sh | 2 +- > t/t9300-fast-import.sh | 2 +- > 28 files changed, 41 insertions(+), 41 deletions(-) Whew. These are quite a lot of typos. I see some _("misspelled strings") have been touched, which would mean this requires translator work, which we do not do for maintenance tracks, so this needs to be applied to 'master' and never merged down to 'maint' and older maintenance tracks. Besides, this includes a patch to Documentation/RelNotes/2.14.0.txt, so there is no chance for this change can go to the maintenance tracks as-is. There are some changes that touch strings t/ outside comment; if the tests are depending on exact object names, this patch could break them, so I checked them carefully---I think all of these are safe. Thanks.
Re: [PATCH] Spelling fixes
Am 09.08.2016 um 20:19 schrieb Junio C Hamano: > > > accidentlyaccidentally > commited committed > dependancydependency > emtpy empty > existance existence > explicitely explicitly > git-upload-achive git-upload-archive > hierachy hierarchy > intialinitial > mulitple multiple > non-existant non-existent > precendence. precedence. > priviledged privileged > programatically programmatically > psuedo-binary pseudo-binary > soemwhere somewhere > successfull successful > unkownunknown > usefull useful > writting writing This reminds me of one occurrence of "indegee" in commit-slab.h that should be "indegree". The word is not in this list above, so I don't know whether you would like to have it fixed in the same patch or not... (BTW, is that word "in-degree" or "ingredient"?) -- Hannes diff --git a/commit-slab.h b/commit-slab.h --- a/commit-slab.h +++ b/commit-slab.h @@ -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: * -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] Spelling fixes
Ville Skyttä writes: > On Tue, Aug 9, 2016 at 9:19 PM, Junio C Hamano wrote: > [...] >> There are two "commited" you seem to have missed, though, >> >> t/t3420-rebase-autostash.sh:echo uncommited-content >file0 && >> t/t3420-rebase-autostash.sh:echo uncommited-content >expected && >> >> which I'll queue on top of this patch to be later squashed (i.e. no >> need to resend the whole thing only to add these two). > > Thanks. https://github.com/client9/misspell/pull/61 :) > > Also, there's SSTATE_TRANSFERING->SSTATE_TRANSFERRING in > transport-helper.c, maybe you can squash that one in as well if you > think it's fine? One comment that refers to that token spells it correctly, which is funny ;-) Here is a squashable change I've collected so far. Subject: [PATCH] SQUASH??? indegee indegree transfering transferring uncommiteduncommitted --- commit-slab.h | 2 +- t/t3420-rebase-autostash.sh | 4 ++-- transport-helper.c | 8 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/commit-slab.h b/commit-slab.h index f84b449..be16da7 100644 --- a/commit-slab.h +++ b/commit-slab.h @@ -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: * diff --git a/t/t3420-rebase-autostash.sh b/t/t3420-rebase-autostash.sh index 532ff5c..ab8a63e 100755 --- a/t/t3420-rebase-autostash.sh +++ b/t/t3420-rebase-autostash.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 ' diff --git a/transport-helper.c b/transport-helper.c index 4208743..db2f930 100644 --- a/transport-helper.c +++ b/transport-helper.c @@ -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"; -- 2.9.2-831-g532adb1 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] Spelling fixes
Johannes Sixt writes: > Am 09.08.2016 um 20:19 schrieb Junio C Hamano: >> >> >> accidentlyaccidentally >> commited committed >> dependancydependency >> emtpy empty >> existance existence >> explicitely explicitly >> git-upload-achive git-upload-archive >> hierachy hierarchy >> intialinitial >> mulitple multiple >> non-existant non-existent >> precendence. precedence. >> priviledged privileged >> programatically programmatically >> psuedo-binary pseudo-binary >> soemwhere somewhere >> successfull successful >> unkownunknown >> usefull useful >> writting writing > > This reminds me of one occurrence of "indegee" in commit-slab.h that > should be "indegree". The word is not in this list above, so I don't > know whether you would like to have it fixed in the same patch or not... > > (BTW, is that word "in-degree" or "ingredient"?) IIRC it is the former, to count "how many incoming arcs does this node have?" Will queue to squash in. Thanks. > -- Hannes > > diff --git a/commit-slab.h b/commit-slab.h > --- a/commit-slab.h > +++ b/commit-slab.h > @@ -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: > * -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] Spelling fixes
On Tue, Aug 9, 2016 at 9:19 PM, Junio C Hamano wrote: [...] > There are two "commited" you seem to have missed, though, > > t/t3420-rebase-autostash.sh:echo uncommited-content >file0 && > t/t3420-rebase-autostash.sh:echo uncommited-content >expected && > > which I'll queue on top of this patch to be later squashed (i.e. no > need to resend the whole thing only to add these two). Thanks. https://github.com/client9/misspell/pull/61 :) Also, there's SSTATE_TRANSFERING->SSTATE_TRANSFERRING in transport-helper.c, maybe you can squash that one in as well if you think it's fine? -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] Spelling fixes
Ville Skyttä writes: > Signed-off-by: Ville Skyttä > --- > Documentation/RelNotes/2.3.10.txt | 2 +- > Documentation/RelNotes/2.4.10.txt | 2 +- > Documentation/RelNotes/2.5.4.txt| 2 +- > Documentation/RelNotes/2.6.1.txt| 2 +- > Documentation/git-remote-fd.txt | 2 +- > Documentation/gitattributes.txt | 2 +- > Documentation/gitmodules.txt| 2 +- > contrib/hooks/multimail/README | 4 ++-- > contrib/mw-to-git/.perlcriticrc | 2 +- > contrib/mw-to-git/git-remote-mediawiki.perl | 2 +- > contrib/subtree/t/t7900-subtree.sh | 2 +- > git-p4.py | 2 +- > sha1_file.c | 2 +- > t/README| 2 +- > t/t1006-cat-file.sh | 2 +- > t/t3101-ls-tree-dirname.sh | 2 +- > t/t6018-rev-list-glob.sh| 2 +- > t/t6030-bisect-porcelain.sh | 2 +- > t/t7001-mv.sh | 8 > t/t7810-grep.sh | 2 +- > t/t9401-git-cvsserver-crlf.sh | 2 +- > upload-pack.c | 2 +- > 22 files changed, 26 insertions(+), 26 deletions(-) Wow, that's a lot of typos. I asked "git show --word-diff" what got changed, which told me this: accidentlyaccidentally commited committed dependancydependency emtpy empty existance existence explicitely explicitly git-upload-achive git-upload-archive hierachy hierarchy intialinitial mulitple multiple non-existant non-existent precendence. precedence. priviledged privileged programatically programmatically psuedo-binary pseudo-binary soemwhere somewhere successfull successful unkownunknown usefull useful writting writing and then looked at all lines in the patch. They all looked reasonable. There are two "commited" you seem to have missed, though, t/t3420-rebase-autostash.sh:echo uncommited-content >file0 && t/t3420-rebase-autostash.sh:echo uncommited-content >expected && which I'll queue on top of this patch to be later squashed (i.e. no need to resend the whole thing only to add these two). Thanks. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] Spelling fixes.
René Scharfe writes: > Am 23.02.2013 15:31, schrieb Ville Skyttä: >> >> Signed-off-by: Ville Skyttä >> --- >> Documentation/RelNotes/1.7.5.4.txt | 2 +- >> Documentation/RelNotes/1.7.8.txt | 2 +- > > Retroactively changing release notes for older versions is not worth > it, I think. > >> Documentation/RelNotes/1.8.2.txt | 2 +- > > Fixing typos in this draft for the next release is a good idea, though. > >> kwset.c| 4 ++-- > >> xdiff/xdiffi.c | 2 +- > > These files come from external sources and it would be nice to push > fixes (not just for typos) upstream as well. > > René A good suggestion. Thanks. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] Spelling fixes.
Am 23.02.2013 15:31, schrieb Ville Skyttä: Signed-off-by: Ville Skyttä --- Documentation/RelNotes/1.7.5.4.txt | 2 +- Documentation/RelNotes/1.7.8.txt | 2 +- Retroactively changing release notes for older versions is not worth it, I think. Documentation/RelNotes/1.8.2.txt | 2 +- Fixing typos in this draft for the next release is a good idea, though. kwset.c| 4 ++-- xdiff/xdiffi.c | 2 +- These files come from external sources and it would be nice to push fixes (not just for typos) upstream as well. René -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] Spelling fixes.
On Sat, Feb 23, 2013 at 9:31 PM, Ville Skyttä wrote: > 49 files changed, 72 insertions(+), 72 deletions(-) I know I make spelling mistakes on daily basis, but I did not know we made so many. Changes in the test suite and non-contrib *.[ch] look good. -- Duy -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html