Various typofixes
PATCH 1/1 Various typofixes
Mostly suggested by codespell <https://github.com/lucasdemarchi/codespell>
Signed-off-by Stefano Lattarini <[email protected]>
--- Documentation/git-credential.txt | 2 +- Documentation/git-remote-ext.txt | 2 +- Documentation/git-svn.txt | 4 ++-- Documentation/git-tools.txt | 2 +- Documentation/revisions.txt | 2 +- Documentation/technical/api-argv-array.txt | 2 +- Documentation/technical/api-credentials.txt | 2 +- Documentation/technical/api-ref-iteration.txt | 2 +- builtin/apply.c | 6 +++--- commit.c | 2 +- commit.h | 2 +- compat/nedmalloc/Readme.txt | 2 +- compat/nedmalloc/malloc.c.h | 6 +++--- compat/obstack.h | 2 +- compat/precompose_utf8.c | 2 +- compat/regex/regcomp.c | 4 ++-- compat/regex/regex.c | 2 +- compat/regex/regex_internal.c | 6 +++--- contrib/mw-to-git/git-remote-mediawiki.perl | 6 +++--- contrib/mw-to-git/t/README | 6 +++--- contrib/mw-to-git/t/install-wiki/LocalSettings.php | 2 +- contrib/mw-to-git/t/t9360-mw-to-git-clone.sh | 2 +- contrib/mw-to-git/t/t9362-mw-to-git-utf8.sh | 10 +++++----- contrib/subtree/t/t7900-subtree.sh | 2 +- diff.c | 2 +- git-add--interactive.perl | 2 +- git-cvsserver.perl | 4 ++-- git-gui/lib/blame.tcl | 2 +- git-gui/lib/index.tcl | 2 +- git-gui/lib/spellcheck.tcl | 4 ++-- git-quiltimport.sh | 2 +- gitweb/INSTALL | 2 +- gitweb/gitweb.perl | 6 +++--- kwset.c | 4 ++-- perl/Git.pm | 2 +- perl/Git/I18N.pm | 2 +- perl/private-Error.pm | 2 +- po/README | 6 +++--- sequencer.c | 2 +- t/t1006-cat-file.sh | 2 +- t/t3511-cherry-pick-x.sh | 4 ++-- t/t3701-add-interactive.sh | 2 +- t/t4014-format-patch.sh | 6 +++--- t/t4124-apply-ws-rule.sh | 2 +- t/t6030-bisect-porcelain.sh | 2 +- t/t7601-merge-pull-config.sh | 2 +- t/t7610-mergetool.sh | 2 +- t/t9001-send-email.sh | 4 ++-- transport-helper.c | 2 +- transport.h | 2 +- xdiff/xdiffi.c | 2 +- xdiff/xhistogram.c | 2 +- 52 files changed, 79 insertions(+), 79 deletions(-)
Documentation/git-credential.txt +1 -1
@@ -56,7 +56,7 @@ For example, if we want a password for `https://example.com/foo.git`, we might generate the following credential description (don't forget the blank line at the end; it tells `git credential` that the application finished feeding all the -infomation it has): +information it has): protocol=https host=example.com
Documentation/git-remote-ext.txt +1 -1
@@ -86,7 +86,7 @@ begins with `ext::`. Examples: edit .ssh/config. "ext::socat -t3600 - ABSTRACT-CONNECT:/git-server %G/somerepo":: - Represents repository with path /somerepo accessable over + Represents repository with path /somerepo accessible over git protocol at abstract namespace address /git-server. "ext::git-server-alias foo %G/repo"::
Documentation/git-svn.txt +2 -2
@@ -245,7 +245,7 @@ first have already been pushed into SVN. patch), "all" (accept all patches), or "quit". + 'git svn dcommit' returns immediately if answer if "no" or "quit", without - commiting anything to SVN. + committing anything to SVN. 'branch':: Create a branch in the SVN repository.
@@ -856,7 +856,7 @@ HANDLING OF SVN BRANCHES ------------------------ If 'git svn' is configured to fetch branches (and --follow-branches is in effect), it sometimes creates multiple Git branches for one -SVN branch, where the addtional branches have names of the form +SVN branch, where the additional branches have names of the form 'branchname@nnn' (with nnn an SVN revision number). These additional branches are created if 'git svn' cannot find a parent commit for the first commit in an SVN branch, to connect the branch to the history of
Documentation/git-tools.txt +1 -1
@@ -109,7 +109,7 @@ Others - *git.el* (contrib/) - This is an Emacs interface for Git. The user interface is modeled on + This is an Emacs interface for Git. The user interface is modelled on pcl-cvs. It has been developed on Emacs 21 and will probably need some tweaking to work on XEmacs.
Documentation/revisions.txt +1 -1
@@ -55,7 +55,7 @@ when you run `git cherry-pick`. + Note that any of the 'refs/*' cases above may come either from the '$GIT_DIR/refs' directory or from the '$GIT_DIR/packed-refs' file. -While the ref name encoding is unspecified, UTF-8 is prefered as +While the ref name encoding is unspecified, UTF-8 is preferred as some output processing may assume ref names in UTF-8. '<refname>@\{<date>\}', e.g. 'master@\{yesterday\}', 'HEAD@\{5 minutes ago\}'::
Documentation/technical/api-argv-array.txt +1 -1
@@ -55,7 +55,7 @@ Functions initial, empty state. `argv_array_detach`:: - Detach the argv array from the `struct argv_array`, transfering + Detach the argv array from the `struct argv_array`, transferring ownership of the allocated array and strings. `argv_array_free_detached`::
Documentation/technical/api-credentials.txt +1 -1
@@ -160,7 +160,7 @@ int foo_login(struct foo_connection *f) break; default: /* - * Some other error occured. We don't know if the + * Some other error occurred. We don't know if the * credential is good or bad, so report nothing to the * credential subsystem. */
Documentation/technical/api-ref-iteration.txt +1 -1
@@ -35,7 +35,7 @@ Iteration functions * `head_ref_submodule()`, `for_each_ref_submodule()`, `for_each_ref_in_submodule()`, `for_each_tag_ref_submodule()`, `for_each_branch_ref_submodule()`, `for_each_remote_ref_submodule()` - do the same as the functions descibed above but for a specified + do the same as the functions described above but for a specified submodule. * `for_each_rawref()` can be used to learn about broken ref and symref.
builtin/apply.c +3 -3
@@ -1921,7 +1921,7 @@ static int parse_binary(char *buffer, unsigned long size, struct patch *patch) }/* -* Read the patch text in "buffer" taht extends for "size" bytes; stop +* Read the patch text in "buffer" that extends for "size" bytes; stop * reading after seeing a single patch (i.e. changes to a single file). * Create fragments (i.e. patch hunks) and hang them to the given patch. * Return the number of bytes consumed, so that the caller can call us
@@ -3029,7 +3029,7 @@ static struct patch *in_fn_table(const char *name)* * The latter is needed to deal with a case where two paths A and B * are swapped by first renaming A to B and then renaming B to A; -* moving A to B should not be prevented due to presense of B as we +* moving A to B should not be prevented due to presence of B as we * will remove it in a later patch. */ #define PATH_TO_BE_DELETED ((struct patch *) -2)
@@ -3513,7 +3513,7 @@ static int check_patch(struct patch *patch)* * A patch to swap-rename between A and B would first rename A * to B and then rename B to A. While applying the first one, -* the presense of B should not stop A from getting renamed to +* the presence of B should not stop A from getting renamed to * B; ask to_be_deleted() about the later rename. Removal of * B and rename from A to B is handled the same way by asking * was_deleted().
commit.c +1 -1
@@ -841,7 +841,7 @@ struct commit_list *get_merge_bases(struct commit *one, struct commit *two, }/* -* Is "commit" a decendant of one of the elements on the "with_commit" list? +* Is "commit" a descendant of one of the elements on the "with_commit" list? */ int is_descendant_of (struct commit *commit,struct commit_list *with_commit) {
commit.h +1 -1
@@ -166,7 +166,7 @@ extern struct commit_list *get_merge_bases(struct commit *rev1, struct commit *rextern struct commit_list *get_merge_bases_many (struct commit *one,int n,struct commit **twos,int cleanup);extern struct commit_list *get_octopus_merge_bases (struct commit_list *in); -/* largest postive number a signed 32-bit integer can contain */ +/* largest positive number a signed 32-bit integer can contain */ #define INFINITE_DEPTH 0x7fffffffextern int register_shallow (const unsigned char *sha1);
compat/nedmalloc/Readme.txt +1 -1
@@ -97,7 +97,7 @@ Chew for reporting this. v1.04alpha_svn915 7th October 2006: * Fixed failure to unlock thread cache list if allocating a new list failed. -Thanks to Dmitry Chichkov for reporting this. Futher thanks to Aleksey Sanin. +Thanks to Dmitry Chichkov for reporting this. Further thanks to Aleksey Sanin. * Fixed realloc(0, <size>) segfaulting. Thanks to Dmitry Chichkov for reporting this. * Made config defines #ifndef so they can be overridden by the build system.
compat/nedmalloc/malloc.c.h +3 -3
@@ -4778,7 +4778,7 @@ void* dlmalloc(size_t bytes) {void dlfree (void * mem) {/* -Consolidate freed chunks with preceeding or succeeding bordering +Consolidate freed chunks with preceding or succeeding bordering free chunks, if they exist, and then place in a bin. Intermixed with special cases for top, dv, mmapped chunks, and usage errors. */
@@ -5680,10 +5680,10 @@ History: Wolfram Gloger ([email protected]). * Use last_remainder in more cases. * Pack bins using idea from [email protected] - * Use ordered bins instead of best-fit threshhold + * Use ordered bins instead of best-fit threshold * Eliminate block-local decls to simplify tracing and debugging. * Support another case of realloc via move into top - * Fix error occuring when initial sbrk_base not word-aligned. + * Fix error occurring when initial sbrk_base not word-aligned. * Rely on page size for units instead of SBRK_UNIT to avoid surprises about sbrk alignment conventions. * Add mallinfo, mallopt. Thanks to Raymond Nijssen
compat/obstack.h +1 -1
@@ -128,7 +128,7 @@ extern "C" {#define __BPTR_ALIGN (B ,P ,A ) ((B) + (((P) - (B) + (A)) & ~(A))) -/* Similiar to _BPTR_ALIGN (B, P, A), except optimize the common case +/* Similar to _BPTR_ALIGN (B, P, A), except optimize the common case where pointers can be converted to integers, aligned as integers, and converted back again. If PTR_INT_TYPE is narrower than a pointer (e.g., the AS/400), play it safe and compute the alignment
compat/precompose_utf8.c +1 -1
@@ -134,7 +134,7 @@ struct dirent_prec_psx *precompose_utf8_readdir(PREC_DIR *prec_dir)if (prec_dir->ic_precompose == (iconv_t)-1 ) {die ("iconv_open(%s,%s) failed, but needed:\n" " precomposed unicode is not supported.\n" -" If you wnat to use decomposed unicode, run\n" +" If you want to use decomposed unicode, run\n" " \"git config core.precomposeunicode false\"\n" , repo_encoding, path_encoding); }else {
compat/regex/regcomp.c +2 -2
@@ -2095,7 +2095,7 @@ peek_token_bracket (re_token_t *token, re_string_t *input, reg_syntax_t syntax)/* Entry point of the parser. Parse the regular expression REGEXP and return the structure tree. -If an error is occured, ERR is set by error code, and return NULL. +If an error is occurred, ERR is set by error code, and return NULL. This function build the following tree, from regular expression <reg_exp>: CAT / \
@@ -3715,7 +3715,7 @@ build_charclass_op (re_dfa_t *dfa, RE_TRANSLATE_TYPE trans,/* This is intended for the expressions like "a{1,3}". Fetch a number from `input', and return the number. Return -1, if the number field is empty like "{,1}". -Return -2, If an error is occured. */ +Return -2, If an error is occurred. */ static int fetch_number (re_string_t *input,re_token_t *token,reg_syntax_t syntax)
compat/regex/regex.c +1 -1
@@ -22,7 +22,7 @@#include "config.h" #endif -/* Make sure noone compiles this code with a C++ compiler. */ +/* Make sure no one compiles this code with a C++ compiler. */ #ifdef __cplusplus# error "This is C code, use a C compiler"#endif
compat/regex/regex_internal.c +3 -3
@@ -1284,7 +1284,7 @@ re_node_set_merge (re_node_set *dest, const re_node_set *src)/* Insert the new element ELEM to the re_node_set* SET. SET should not already have ELEM. -return -1 if an error is occured, return 1 otherwise. */ +return -1 if an error is occurred, return 1 otherwise. */ static int internal_function
@@ -1341,7 +1341,7 @@ re_node_set_insert (re_node_set *set, int elem)/* Insert the new element ELEM to the re_node_set* SET. SET should not already have any element greater than or equal to ELEM. -Return -1 if an error is occured, return 1 otherwise. */ +Return -1 if an error is occurred, return 1 otherwise. */ static int internal_function
@@ -1416,7 +1416,7 @@ re_node_set_remove_at (re_node_set *set, int idx)/* Add the token TOKEN to dfa->nodes, and return the index of the token. -Or return -1, if an error will be occured. */ +Or return -1, if an error will be occurred. */ static int internal_function
contrib/mw-to-git/git-remote-mediawiki.perl +3 -3
@@ -28,7 +28,7 @@ use warnings; use constant SLASH_REPLACEMENT => "%2F"; # It's not always possible to delete pages (may require some -# priviledges). Deleted pages are replaced with this content. +# privileges). Deleted pages are replaced with this content. use constant DELETED_CONTENT => "[[Category:Deleted]]\n"; # It's not possible to create empty pages. New empty files in Git are
@@ -841,7 +841,7 @@ sub mw_import_ref { if ($fetch_from == 1 && $n == 0) { print STDERR "You appear to have cloned an empty MediaWiki.\n"; # Something has to be done remote-helper side. If nothing is done, an error is - # thrown saying that HEAD is refering to unknown object 0000000000000000000 + # thrown saying that HEAD is referring to unknown object 0000000000000000000 # and the clone fails. } }
@@ -1067,7 +1067,7 @@ sub mw_push_file { my $file_content; if ($page_deleted) { # Deleting a page usually requires - # special priviledges. A common + # special privileges. A common # convention is to replace the page # with this content instead: $file_content = DELETED_CONTENT;
contrib/mw-to-git/t/README +3 -3
@@ -25,7 +25,7 @@ Principles and Technical Choices The test environment makes it easy to install and manipulate one or several MediaWiki instances. To allow developers to run the testsuite -easily, the environment does not require root priviledge (except to +easily, the environment does not require root privilege (except to install the required packages if needed). It starts a webserver instance on the user's account (using lighttpd greatly helps for that), and does not need a separate database daemon (thanks to the use
@@ -81,7 +81,7 @@ parameters, please refer to the `test-gitmw-lib.sh` and ** `test_check_wiki_precond`: Check if the tests must be skipped or not. Please use this function -at the beggining of each new test file. +at the beginning of each new test file. ** `wiki_getpage`: Fetch a given page from the wiki and puts its content in the
@@ -113,7 +113,7 @@ Tests if a given page exists on the wiki. ** `wiki_reset`: Reset the wiki, i.e. flush the database. Use this function at the -begining of each new test, except if the test re-uses the same wiki +beginning of each new test, except if the test re-uses the same wiki (and history) as the previous test. How to write a new test
contrib/mw-to-git/t/install-wiki/LocalSettings.php +1 -1
@@ -88,7 +88,7 @@ $wgShellLocale = "en_US.utf8"; ## Set $wgCacheDirectory to a writable directory on the web server ## to make your wiki go slightly faster. The directory should not -## be publically accessible from the web. +## be publicly accessible from the web. #$wgCacheDirectory = "$IP/cache"; # Site language code, should be one of the list in ./languages/Names.php
contrib/mw-to-git/t/t9360-mw-to-git-clone.sh +1 -1
@@ -125,7 +125,7 @@ test_expect_success 'Git clone works with one specific page cloned ' ' wiki_editpage foo "I will not be cloned" false && wiki_editpage bar "Do not clone me" false && wiki_editpage namnam "I will be cloned :)" false -s="this log must stay" && - wiki_editpage nyancat "nyan nyan nyan you cant clone me" false && + wiki_editpage nyancat "nyan nyan nyan you cannot clone me" false && git clone -c remote.origin.pages=namnam \ mediawiki::'"$WIKI_URL"' mw_dir_8 && test_contains_N_files mw_dir_8 1 &&
contrib/mw-to-git/t/t9362-mw-to-git-utf8.sh +5 -5
@@ -139,7 +139,7 @@ test_expect_success 'character $ in file name (git -> mw) ' ' ' -test_expect_failure 'capital at the begining of file names' ' +test_expect_failure 'capital at the beginning of file names' ' wiki_reset && git clone mediawiki::'"$WIKI_URL"' mw_dir_10 && (
@@ -156,7 +156,7 @@ test_expect_failure 'capital at the begining of file names' ' ' -test_expect_failure 'special character at the begining of file name from mw to git' ' +test_expect_failure 'special character at the beginning of file name from mw to git' ' wiki_reset && git clone mediawiki::'"$WIKI_URL"' mw_dir_11 && wiki_editpage {char_1 "expect to be renamed {char_1" false &&
@@ -207,7 +207,7 @@ test_expect_success 'test of correct formating for file name from mw to git' ' ' -test_expect_failure 'test of correct formating for file name begining with special character' ' +test_expect_failure 'test of correct formating for file name beginning with special character' ' wiki_reset && git clone mediawiki::'"$WIKI_URL"' mw_dir_13 && (
@@ -215,7 +215,7 @@ test_expect_failure 'test of correct formating for file name begining with speci echo "my new file {char_1" >\{char_1.mw && echo "my new file [char_2" >\[char_2.mw && git add . && - git commit -am "commiting some exotic file name..." && + git commit -am "committing some exotic file name..." && git push && git pull ) &&
@@ -234,7 +234,7 @@ test_expect_success 'test of correct formating for file name from git to mw' ' echo "my new file char{_1" >Char\{_1.mw && echo "my new file char[_2" >Char\[_2.mw && git add . && - git commit -m "commiting some exotic file name..." && + git commit -m "committing some exotic file name..." && git push ) && wiki_getallpage ref_page_14 &&
contrib/subtree/t/t7900-subtree.sh +1 -1
@@ -419,7 +419,7 @@ test_expect_success 'add main-sub5' ' test_expect_success 'split for main-sub5 without --onto' ' # also test that we still can split out an entirely new subtree # if the parent of the first commit in the tree is not empty, - # then the new subtree has accidently been attached to something + # then the new subtree has accidentally been attached to something git subtree split --prefix subdir2 --branch mainsub5 && check_equal ''"$(git log --pretty=format:%P -1 mainsub5)"'' "" '
diff.c +1 -1
@@ -1565,7 +1565,7 @@ static void show_stats(struct diffstat_t *data, struct diff_options *options)* Binary files are displayed with "Bin XXX -> YYY bytes" * instead of the change count and graph. This part is treated * similarly to the graph part, except that it is not -* "scaled". If total width is too small to accomodate the +* "scaled". If total width is too small to accommodate the * guaranteed minimum width of the filename part and the * separators and this message, this message will "overflow" * making the line longer than the maximum width.
git-add--interactive.perl +1 -1
@@ -1247,7 +1247,7 @@ sub summarize_hunk { # Print a one-line summary of each hunk in the array ref in -# the first argument, starting wih the index in the 2nd. +# the first argument, starting with the index in the 2nd. sub display_hunks { my ($hunks, $i) = @_; my $ctr = 0;
git-cvsserver.perl +2 -2
@@ -2911,7 +2911,7 @@ sub filenamesplit } # Cleanup various junk in filename (try to canonicalize it), and -# add prependdir to accomodate running CVS client from a +# add prependdir to accommodate running CVS client from a # subdirectory (so the output is relative to top directory of the project). sub filecleanup {
@@ -4583,7 +4583,7 @@ sub getmeta # the numerical value of the corresponding byte plus # 100. # - "plus 100" avoids "0"s, and also reduces the - # likelyhood of a collision in the case that someone someday + # likelihood of a collision in the case that someone someday # writes an import tool that tries to preserve original # CVS revision numbers, and the original CVS data had done # lots of branches off of branches and other strangeness to
git-gui/lib/blame.tcl +1 -1
@@ -5,7 +5,7 @@ class blame { image create photo ::blame::img_back_arrow -data {R0lGODlhGAAYAIUAAPwCBEzKXFTSZIz+nGzmhGzqfGTidIT+nEzGXHTqhGzmfGzifFzadETCVES+VARWDFzWbHzyjAReDGTadFTOZDSyRDyyTCymPARaFGTedFzSbDy2TCyqRCyqPARaDAyCHES6VDy6VCyiPAR6HCSeNByWLARyFARiDARqFGTifARiFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAYABgAAAajQIBwSCwaj8ikcsk0BppJwRPqHEypQwHBis0WDAdEFyBIKBaMAKLBdjQeSkFBYTBAIvgEoS6JmhUTEwIUDQ4VFhcMGEhyCgoZExoUaxsWHB0THkgfAXUGAhoBDSAVFR0XBnCbDRmgog0hpSIiDJpJIyEQhBUcJCIlwA22SSYVogknEg8eD82qSigdDSknY0IqJQXPYxIl1dZCGNvWw+Dm510GQQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7} -# Persistant data (survives loads) +# Persistent data (survives loads) # field history {}; # viewer history: {commit path} field header ; # array commit,key -> header field
git-gui/lib/index.tcl +1 -1
@@ -414,7 +414,7 @@ proc revert_helper {txt paths} { # such distinction is needed in some languages. Previously, the # code used "Revert changes in" for both, but that can't work # in languages where 'in' must be combined with word from - # rest of string (in diffrent way for both cases of course). + # rest of string (in different way for both cases of course). # # FIXME: Unfortunately, even that isn't enough in some languages # as they have quite complex plural-form rules. Unfortunately,
git-gui/lib/spellcheck.tcl +2 -2
@@ -14,7 +14,7 @@ field w_menu ; # context menu for the widget field s_menuidx 0 ; # last index of insertion into $w_menu field s_i {} ; # timer registration for _run callbacks -field s_clear 0 ; # did we erase mispelled tags yet? +field s_clear 0 ; # did we erase misspelled tags yet? field s_seen [list] ; # lines last seen from $w_text in _run field s_checked [list] ; # lines already checked field s_pending [list] ; # [$line $data] sent to ispell/aspell
@@ -259,7 +259,7 @@ method _run {} { if {$n == $cur_line && ![regexp {^\W$} [$w_text get $cur_pos insert]]} { - # If the current word is mispelled remove the tag + # If the current word is misspelled remove the tag # but force a spellcheck later. # set tags [$w_text tag names $cur_pos]
git-quiltimport.sh +1 -1
@@ -59,7 +59,7 @@ tmp_patch="$tmp_dir/patch" tmp_info="$tmp_dir/info" -# Find the intial commit +# Find the initial commit commit=$(git rev-parse HEAD) mkdir $tmp_dir || exit 2
gitweb/INSTALL +1 -1
@@ -244,7 +244,7 @@ for gitweb (in gitweb/README), and gitweb.conf(5) manpage. through the GITWEB_CONFIG_SYSTEM environment variable. Note that if per-instance configuration file exists, then system-wide - configuration is _not used at all_. This is quite untypical and suprising + configuration is _not used at all_. This is quite untypical and surprising behavior. On the other hand changing current behavior would break backwards compatibility and can lead to unexpected changes in gitweb behavior. Therefore gitweb also looks for common system-wide configuration file,
gitweb/gitweb.perl +3 -3
@@ -683,7 +683,7 @@ sub evaluate_gitweb_config { our $GITWEB_CONFIG_SYSTEM = $ENV{'GITWEB_CONFIG_SYSTEM'} || "++GITWEB_CONFIG_SYSTEM++"; our $GITWEB_CONFIG_COMMON = $ENV{'GITWEB_CONFIG_COMMON'} || "++GITWEB_CONFIG_COMMON++"; - # Protect agains duplications of file names, to not read config twice. + # Protect against duplications of file names, to not read config twice. # Only one of $GITWEB_CONFIG and $GITWEB_CONFIG_SYSTEM is used, so # there possibility of duplication of filename there doesn't matter. $GITWEB_CONFIG = "" if ($GITWEB_CONFIG eq $GITWEB_CONFIG_COMMON);
@@ -1136,7 +1136,7 @@ sub handle_errors_html { # to avoid infinite loop where error occurs in die_error, # change handler to default handler, disabling handle_errors_html - set_message("Error occured when inside die_error:\n$msg"); + set_message("Error occurred when inside die_error:\n$msg"); # you cannot jump out of die_error when called as error handler; # the subroutine set via CGI::Carp::set_message is called _after_
@@ -7485,7 +7485,7 @@ sub git_object { system(git_cmd(), "cat-file", '-e', $hash_base) == 0 or die_error(404, "Base object does not exist"); - # here errors should not hapen + # here errors should not happen open my $fd, "-|", git_cmd(), "ls-tree", $hash_base, "--", $file_name or die_error(500, "Open git-ls-tree failed"); my $line = <$fd>;
kwset.c +2 -2
@@ -26,7 +26,7 @@The author may be reached (Email) at the address [email protected], or (US mail) as Mike Haertel c/o Free Software Foundation. */ -/* The algorithm implemented by these routines bears a startling resemblence +/* The algorithm implemented by these routines bears a startling resemblance to one discovered by Beate Commentz-Walter, although it is not identical. See "A String Matching Algorithm Fast on the Average," Technical Report, IBM-Germany, Scientific Center Heidelberg, Tiergartenstrasse 15, D-6900
@@ -435,7 +435,7 @@ kwsprep (kwset_t kws)/* Update the delta table for the descendents of this node. */ treedelta (curr->links, curr->depth, delta); -/* Compute the failure function for the decendents of this node. */ +/* Compute the failure function for the descendants of this node. */ treefails (curr->links, curr->fail, kwset->trie);/* Update the shifts at each node in the current node's chain
perl/Git.pm +1 -1
@@ -1180,7 +1180,7 @@ my (%TEMP_FILEMAP, %TEMP_FILES); =item temp_acquire ( NAME ) -Attempts to retreive the temporary file mapped to the string C<NAME>. If an +Attempts to retrieve the temporary file mapped to the string C<NAME>. If an associated temp file has not been created this session or was closed, it is created, cached, and set for autoflush and binmode.
perl/Git/I18N.pm +1 -1
@@ -68,7 +68,7 @@ Git::I18N - Perl interface to Git's Gettext localizations print __("Welcome to Git!\n"); - printf __("The following error occured: %s\n"), $error; + printf __("The following error occurred: %s\n"), $error; =head1 DESCRIPTION
perl/private-Error.pm +1 -1
@@ -769,7 +769,7 @@ is a numeric value. These values are what will be returned by the overload methods. If the text value ends with C<at file line 1> as $@ strings do, then -this infomation will be used to set the C<-file> and C<-line> arguments +this information will be used to set the C<-file> and C<-line> arguments of the error object. This class is used internally if an eval'd block die's with an error
po/README +3 -3
@@ -232,7 +232,7 @@ Shell: # To interpolate variables: details="oh noes" - eval_gettext "An error occured: \$details"; echo + eval_gettext "An error occurred: \$details"; echo In addition we have wrappers for messages that end with a trailing newline. I.e. you could write the above as:
@@ -242,7 +242,7 @@ Shell: # To interpolate variables: details="oh noes" - eval_gettextln "An error occured: \$details" + eval_gettextln "An error occurred: \$details" More documentation about the interface is available in the GNU info page: `info '(gettext)sh'`. Looking at git-am.sh (the first shell
@@ -257,7 +257,7 @@ Perl: use Git::I18N; print __("Welcome to Git!\n"); - printf __("The following error occured: %s\n"), $error; + printf __("The following error occurred: %s\n"), $error; Run `perldoc perl/Git/I18N.pm` for more info.
sequencer.c +1 -1
@@ -216,7 +216,7 @@ static void print_advice(int show_hint, struct replay_opts *opts)if (msg) {fprintf (stderr,"%s\n" , msg);/* -* A conflict has occured but the porcelain +* A conflict has occurred but the porcelain * (typically rebase --interactive) wants to take care * of the commit itself so remove CHERRY_PICK_HEAD */
t/t1006-cat-file.sh +1 -1
@@ -116,7 +116,7 @@ tree_pretty_content="100644 blob $hello_sha1 hello" run_tests 'tree' $tree_sha1 $tree_size "" "$tree_pretty_content" -commit_message="Intial commit" +commit_message="Initial commit" commit_sha1=$(echo_without_newline "$commit_message" | git commit-tree $tree_sha1) commit_size=176 commit_content="tree $tree_sha1
t/t3511-cherry-pick-x.sh +2 -2
@@ -133,7 +133,7 @@ test_expect_success 'cherry-pick -x -s inserts blank line when conforming footer test_cmp expect actual ' -test_expect_success 'cherry-pick -s adds sob when last sob doesnt match committer' ' +test_expect_success 'cherry-pick -s adds sob when last sob does not match committer' ' pristine_detach initial && git cherry-pick -s mesg-with-footer && cat <<-EOF >expect &&
@@ -144,7 +144,7 @@ test_expect_success 'cherry-pick -s adds sob when last sob doesnt match committe test_cmp expect actual ' -test_expect_success 'cherry-pick -x -s adds sob when last sob doesnt match committer' ' +test_expect_success 'cherry-pick -x -s adds sob when last sob does not match committer' ' pristine_detach initial && sha1=`git rev-parse mesg-with-footer^0` && git cherry-pick -x -s mesg-with-footer &&
t/t3701-add-interactive.sh +1 -1
@@ -319,7 +319,7 @@ test_expect_success PERL 'split hunk "add -p (edit)"' ' # times to get out. # # 2. Correct version applies the (not)edited version, and asks - # about the next hunk, against wich we say q and program + # about the next hunk, against which we say q and program # exits. for a in s e q n q q do
t/t4014-format-patch.sh +3 -3
@@ -742,21 +742,21 @@ test_expect_success 'format-patch --signature --cover-letter' ' test 2 = $(grep "my sig" output | wc -l) ' -test_expect_success 'format.signature="" supresses signatures' ' +test_expect_success 'format.signature="" suppresses signatures' ' git config format.signature "" && git format-patch --stdout -1 >output && check_patch output && ! grep "^-- \$" output ' -test_expect_success 'format-patch --no-signature supresses signatures' ' +test_expect_success 'format-patch --no-signature suppresses signatures' ' git config --unset-all format.signature && git format-patch --stdout --no-signature -1 >output && check_patch output && ! grep "^-- \$" output ' -test_expect_success 'format-patch --signature="" supresses signatures' ' +test_expect_success 'format-patch --signature="" suppresses signatures' ' git format-patch --stdout --signature="" -1 >output && check_patch output && ! grep "^-- \$" output
t/t4124-apply-ws-rule.sh +1 -1
@@ -47,7 +47,7 @@ test_fix () { # find touched lines $DIFF file target | sed -n -e "s/^> //p" >fixed - # the changed lines are all expeced to change + # the changed lines are all expected to change fixed_cnt=$(wc -l <fixed) case "$1" in '') expect_cnt=$fixed_cnt ;;
t/t6030-bisect-porcelain.sh +1 -1
@@ -190,7 +190,7 @@ test_expect_success 'bisect start: no ".git/BISECT_START" if checkout error' ' # $HASH1 is good, $HASH4 is bad, we skip $HASH3 # but $HASH2 is bad, # so we should find $HASH2 as the first bad commit -test_expect_success 'bisect skip: successfull result' ' +test_expect_success 'bisect skip: successful result' ' git bisect reset && git bisect start $HASH4 $HASH1 && git bisect skip &&
t/t7601-merge-pull-config.sh +1 -1
@@ -109,7 +109,7 @@ test_expect_success 'setup conflicted merge' ' ' # First do the merge with resolve and recursive then verify that -# recusive is choosen. +# recusive is chosen. test_expect_success 'merge picks up the best result' ' git config --unset-all pull.twohead &&
t/t7610-mergetool.sh +1 -1
@@ -237,7 +237,7 @@ test_expect_success 'mergetool takes partial path' ' git submodule update -N && test_must_fail git merge master && - #shouldnt need these lines + #should not need these lines #( yes "d" | git mergetool file11 >/dev/null 2>&1 ) && #( yes "d" | git mergetool file12 >/dev/null 2>&1 ) && #( yes "l" | git mergetool submod >/dev/null 2>&1 ) &&
t/t9001-send-email.sh +2 -2
@@ -101,7 +101,7 @@ test_expect_success $PREREQ \ test_expect_success $PREREQ 'Send patches with --envelope-sender' ' clean_fake_sendmail && - git send-email --envelope-sender="Patch Contributer <[email protected]>" --suppress-cc=sob --from="Example <[email protected]>" [email protected] --smtp-server="$(pwd)/fake.sendmail" $patches 2>errors + git send-email --envelope-sender="Patch Contributor <[email protected]>" --suppress-cc=sob --from="Example <[email protected]>" [email protected] --smtp-server="$(pwd)/fake.sendmail" $patches 2>errors ' test_expect_success $PREREQ 'setup expect' '
@@ -787,7 +787,7 @@ test_expect_success $PREREQ 'confirm detects EOF (auto causes failure)' ' test $ret = "0" ' -test_expect_success $PREREQ 'confirm doesnt loop forever' ' +test_expect_success $PREREQ 'confirm does not loop forever' ' CONFIRM=$(git config --get sendemail.confirm) && git config sendemail.confirm auto && GIT_SEND_EMAIL_NOTTY=1 &&
transport-helper.c +1 -1
@@ -991,7 +991,7 @@ struct unidirectional_transfer {int src_is_sock;/* Is destination socket? */ int dest_is_sock; -/* Transfer state (TRANSFERING/FLUSHING/FINISHED) */ +/* Transfer state (TRANSFERRING/FLUSHING/FINISHED) */ int state;/* Buffer. */ char buf[BUFFERSIZE ];
transport.h +1 -1
@@ -74,7 +74,7 @@ struct transport { const char *executable, int fd[2]);/** get_refs_list(), fetch(), and push_refs() can keep -* resources (such as a connection) reserved for futher +* resources (such as a connection) reserved for further * use. disconnect() releases these resources. **/ int (*disconnect)(struct transport *connection);
xdiff/xdiffi.c +1 -1
@@ -490,7 +490,7 @@ int xdl_change_compact(xdfile_t *xdf, xdfile_t *xdfo, long flags) {/* * Try to move back the possibly merged group of changes, to match -* the recorded postion in the other file. +* the recorded position in the other file. */ while (ixref < ix) { rchg[--ixs] =1 ;
xdiff/xhistogram.c +1 -1
@@ -55,7 +55,7 @@ struct histindex {struct record {unsigned int ptr, cnt;struct record *next; - } **records,/* an ocurrence */ + } **records,/* an occurrence */ **line_map;/* map of line to record chain */ chastore_t rcha;unsigned int *next_ptrs;
Signature · 1 line
1.8.2.373.g961c512
Quoted 9 lines · Stefano Lattarini
Mostly suggested by codespell <https://github.com/lucasdemarchi/codespell>
Signed-off-by Stefano Lattarini <[email protected]>---
compat/regex/regcomp.c +0
-0
compat/regex/regcomp.c peek_token_bracket (re_token_t *token, re_string_t *input, reg_syntax_t syntax) · line 2098
Quoted 5 lines
compat/regex/regcomp.c +1
-1@@ -2095,7 +2095,7 @@ peek_token_bracket (re_token_t *token, re_string_t *input, reg_syntax_t syntax)/* Entry point of the parser. Parse the regular expression REGEXP and return the structure tree. -If an error is occured, ERR is set by error code, and return NULL. +If an error is occurred, ERR is set by error code, and return NULL.
Not new in this patch, but the grammar "error is occurred" is rather poor. Since this is a cleanup patch, perhaps it makes sense to adjust the grammar as well.
compat/regex/regcomp.c build_charclass_op (re_dfa_t *dfa, RE_TRANSLATE_TYPE trans, · line 3718
Quoted 9 lines
compat/regex/regcomp.c +1
-1This function build the following tree, from regular expression <reg_exp>:CAT / \@@ -3715,7 +3715,7 @@ build_charclass_op (re_dfa_t *dfa, RE_TRANSLATE_TYPE trans,/* This is intended for the expressions like "a{1,3}". Fetch a number from `input', and return the number. Return -1, if the number field is empty like "{,1}". -Return -2, If an error is occured. */ +Return -2, If an error is occurred. */
Also not new with the patch: s/If/if/
Ditto regarding grammar.
compat/regex/regex_internal.c re_node_set_merge (re_node_set *dest, const re_node_set *src) · line 1287
Quoted 10 lines
compat/regex/regex_internal.c +1
-1@@ -1284,7 +1284,7 @@ re_node_set_merge (re_node_set *dest, const re_node_set *src)/* Insert the new element ELEM to the re_node_set* SET. SET should not already have ELEM. -return -1 if an error is occured, return 1 otherwise. */ +return -1 if an error is occurred, return 1 otherwise. */
Ditto: grammar
compat/regex/regex_internal.c re_node_set_insert (re_node_set *set, int elem) · line 1344
Quoted 9 lines
compat/regex/regex_internal.c +1
-1static int internal_function@@ -1341,7 +1341,7 @@ re_node_set_insert (re_node_set *set, int elem)/* Insert the new element ELEM to the re_node_set* SET. SET should not already have any element greater than or equal to ELEM. -Return -1 if an error is occured, return 1 otherwise. */ +Return -1 if an error is occurred, return 1 otherwise. */
Grammar.
compat/regex/regex_internal.c re_node_set_remove_at (re_node_set *set, int idx) · line 1419
Quoted 8 lines
compat/regex/regex_internal.c +1
-1static int internal_function@@ -1416,7 +1416,7 @@ re_node_set_remove_at (re_node_set *set, int idx)/* Add the token TOKEN to dfa->nodes, and return the index of the token. -Or return -1, if an error will be occured. */ +Or return -1, if an error will be occurred. */
Grammar.
contrib/mw-to-git/t/t9362-mw-to-git-utf8.sh test_expect_success 'test of correct formating for file name from mw to git' ' · line 210
Quoted 6 lines
contrib/mw-to-git/t/t9362-mw-to-git-utf8.sh +1
-1-test_expect_failure 'test of correct formating for file name begining with special character' ' +test_expect_failure 'test of correct formating for file name beginning with special character' '
Missed by codespell: s/formating/formatting/
contrib/mw-to-git/t/t9362-mw-to-git-utf8.sh test_expect_failure 'test of correct formating for file name begining with speci
Quoted 4 lines
wiki_reset && git clone mediawiki::'"$WIKI_URL"' mw_dir_13 && (contrib/mw-to-git/t/t9362-mw-to-git-utf8.sh +0
-0@@ -215,7 +215,7 @@ test_expect_failure 'test of correct formating for file name begining with speci
Ditto: s/formating/formatting/
contrib/mw-to-git/t/t9362-mw-to-git-utf8.sh test_expect_success 'test of correct formating for file name from git to mw' '
Quoted 9 lines
contrib/mw-to-git/t/t9362-mw-to-git-utf8.sh +1
-1echo "my new file {char_1" >\{char_1.mw && echo "my new file [char_2" >\[char_2.mw && git add . && - git commit -am "commiting some exotic file name..." && + git commit -am "committing some exotic file name..." && git push && git pull ) &&@@ -234,7 +234,7 @@ test_expect_success 'test of correct formating for file name from git to mw' '
s/formating/formatting/
Quoted 8 lines
contrib/mw-to-git/t/t9362-mw-to-git-utf8.sh +1
-1echo "my new file char{_1" >Char\{_1.mw && echo "my new file char[_2" >Char\[_2.mw && git add . && - git commit -m "commiting some exotic file name..." && + git commit -m "committing some exotic file name..." && git push ) && wiki_getallpage ref_page_14 &&
PATCH v2 1/1 Fix various typos and grammaros
Most typos suggested by codespell:
<https://github.com/lucasdemarchi/codespell>
Grammaros pointed out by Eric Sunshine.
Helped-by Eric Sunshine <[email protected]>
Signed-off-by Stefano Lattarini <[email protected]>
--- Documentation/git-credential.txt | 2 +- Documentation/git-remote-ext.txt | 2 +- Documentation/git-svn.txt | 4 ++-- Documentation/git-tools.txt | 2 +- Documentation/revisions.txt | 2 +- Documentation/technical/api-argv-array.txt | 2 +- Documentation/technical/api-credentials.txt | 2 +- Documentation/technical/api-ref-iteration.txt | 2 +- builtin/apply.c | 6 +++--- commit.c | 2 +- commit.h | 2 +- compat/nedmalloc/Readme.txt | 2 +- compat/nedmalloc/malloc.c.h | 6 +++--- compat/obstack.h | 2 +- compat/precompose_utf8.c | 2 +- compat/regex/regcomp.c | 4 ++-- compat/regex/regex.c | 2 +- compat/regex/regex_internal.c | 6 +++--- contrib/mw-to-git/git-remote-mediawiki.perl | 6 +++--- contrib/mw-to-git/t/README | 6 +++--- contrib/mw-to-git/t/install-wiki/LocalSettings.php | 2 +- contrib/mw-to-git/t/t9360-mw-to-git-clone.sh | 2 +- contrib/mw-to-git/t/t9362-mw-to-git-utf8.sh | 14 +++++++------- contrib/subtree/t/t7900-subtree.sh | 2 +- diff.c | 2 +- git-add--interactive.perl | 2 +- git-cvsserver.perl | 4 ++-- git-gui/lib/blame.tcl | 2 +- git-gui/lib/index.tcl | 2 +- git-gui/lib/spellcheck.tcl | 4 ++-- git-quiltimport.sh | 2 +- gitweb/INSTALL | 2 +- gitweb/gitweb.perl | 6 +++--- kwset.c | 4 ++-- perl/Git.pm | 2 +- perl/Git/I18N.pm | 2 +- perl/private-Error.pm | 2 +- po/README | 6 +++--- sequencer.c | 2 +- t/t1006-cat-file.sh | 2 +- t/t3511-cherry-pick-x.sh | 4 ++-- t/t3701-add-interactive.sh | 2 +- t/t4014-format-patch.sh | 6 +++--- t/t4124-apply-ws-rule.sh | 2 +- t/t6030-bisect-porcelain.sh | 2 +- t/t7601-merge-pull-config.sh | 2 +- t/t7610-mergetool.sh | 2 +- t/t9001-send-email.sh | 4 ++-- transport-helper.c | 2 +- transport.h | 2 +- xdiff/xdiffi.c | 2 +- xdiff/xhistogram.c | 2 +- 52 files changed, 81 insertions(+), 81 deletions(-)
Documentation/git-credential.txt +1 -1
@@ -56,7 +56,7 @@ For example, if we want a password for `https://example.com/foo.git`, we might generate the following credential description (don't forget the blank line at the end; it tells `git credential` that the application finished feeding all the -infomation it has): +information it has): protocol=https host=example.com
Documentation/git-remote-ext.txt +1 -1
@@ -86,7 +86,7 @@ begins with `ext::`. Examples: edit .ssh/config. "ext::socat -t3600 - ABSTRACT-CONNECT:/git-server %G/somerepo":: - Represents repository with path /somerepo accessable over + Represents repository with path /somerepo accessible over git protocol at abstract namespace address /git-server. "ext::git-server-alias foo %G/repo"::
Documentation/git-svn.txt +2 -2
@@ -245,7 +245,7 @@ first have already been pushed into SVN. patch), "all" (accept all patches), or "quit". + 'git svn dcommit' returns immediately if answer if "no" or "quit", without - commiting anything to SVN. + committing anything to SVN. 'branch':: Create a branch in the SVN repository.
@@ -856,7 +856,7 @@ HANDLING OF SVN BRANCHES ------------------------ If 'git svn' is configured to fetch branches (and --follow-branches is in effect), it sometimes creates multiple Git branches for one -SVN branch, where the addtional branches have names of the form +SVN branch, where the additional branches have names of the form 'branchname@nnn' (with nnn an SVN revision number). These additional branches are created if 'git svn' cannot find a parent commit for the first commit in an SVN branch, to connect the branch to the history of
Documentation/git-tools.txt +1 -1
@@ -109,7 +109,7 @@ Others - *git.el* (contrib/) - This is an Emacs interface for Git. The user interface is modeled on + This is an Emacs interface for Git. The user interface is modelled on pcl-cvs. It has been developed on Emacs 21 and will probably need some tweaking to work on XEmacs.
Documentation/revisions.txt +1 -1
@@ -55,7 +55,7 @@ when you run `git cherry-pick`. + Note that any of the 'refs/*' cases above may come either from the '$GIT_DIR/refs' directory or from the '$GIT_DIR/packed-refs' file. -While the ref name encoding is unspecified, UTF-8 is prefered as +While the ref name encoding is unspecified, UTF-8 is preferred as some output processing may assume ref names in UTF-8. '<refname>@\{<date>\}', e.g. 'master@\{yesterday\}', 'HEAD@\{5 minutes ago\}'::
Documentation/technical/api-argv-array.txt +1 -1
@@ -55,7 +55,7 @@ Functions initial, empty state. `argv_array_detach`:: - Detach the argv array from the `struct argv_array`, transfering + Detach the argv array from the `struct argv_array`, transferring ownership of the allocated array and strings. `argv_array_free_detached`::
Documentation/technical/api-credentials.txt +1 -1
@@ -160,7 +160,7 @@ int foo_login(struct foo_connection *f) break; default: /* - * Some other error occured. We don't know if the + * Some other error occurred. We don't know if the * credential is good or bad, so report nothing to the * credential subsystem. */
Documentation/technical/api-ref-iteration.txt +1 -1
@@ -35,7 +35,7 @@ Iteration functions * `head_ref_submodule()`, `for_each_ref_submodule()`, `for_each_ref_in_submodule()`, `for_each_tag_ref_submodule()`, `for_each_branch_ref_submodule()`, `for_each_remote_ref_submodule()` - do the same as the functions descibed above but for a specified + do the same as the functions described above but for a specified submodule. * `for_each_rawref()` can be used to learn about broken ref and symref.
builtin/apply.c +3 -3
@@ -1921,7 +1921,7 @@ static int parse_binary(char *buffer, unsigned long size, struct patch *patch) }/* -* Read the patch text in "buffer" taht extends for "size" bytes; stop +* Read the patch text in "buffer" that extends for "size" bytes; stop * reading after seeing a single patch (i.e. changes to a single file). * Create fragments (i.e. patch hunks) and hang them to the given patch. * Return the number of bytes consumed, so that the caller can call us
@@ -3029,7 +3029,7 @@ static struct patch *in_fn_table(const char *name)* * The latter is needed to deal with a case where two paths A and B * are swapped by first renaming A to B and then renaming B to A; -* moving A to B should not be prevented due to presense of B as we +* moving A to B should not be prevented due to presence of B as we * will remove it in a later patch. */ #define PATH_TO_BE_DELETED ((struct patch *) -2)
@@ -3513,7 +3513,7 @@ static int check_patch(struct patch *patch)* * A patch to swap-rename between A and B would first rename A * to B and then rename B to A. While applying the first one, -* the presense of B should not stop A from getting renamed to +* the presence of B should not stop A from getting renamed to * B; ask to_be_deleted() about the later rename. Removal of * B and rename from A to B is handled the same way by asking * was_deleted().
commit.c +1 -1
@@ -841,7 +841,7 @@ struct commit_list *get_merge_bases(struct commit *one, struct commit *two, }/* -* Is "commit" a decendant of one of the elements on the "with_commit" list? +* Is "commit" a descendant of one of the elements on the "with_commit" list? */ int is_descendant_of (struct commit *commit,struct commit_list *with_commit) {
commit.h +1 -1
@@ -166,7 +166,7 @@ extern struct commit_list *get_merge_bases(struct commit *rev1, struct commit *rextern struct commit_list *get_merge_bases_many (struct commit *one,int n,struct commit **twos,int cleanup);extern struct commit_list *get_octopus_merge_bases (struct commit_list *in); -/* largest postive number a signed 32-bit integer can contain */ +/* largest positive number a signed 32-bit integer can contain */ #define INFINITE_DEPTH 0x7fffffffextern int register_shallow (const unsigned char *sha1);
compat/nedmalloc/Readme.txt +1 -1
@@ -97,7 +97,7 @@ Chew for reporting this. v1.04alpha_svn915 7th October 2006: * Fixed failure to unlock thread cache list if allocating a new list failed. -Thanks to Dmitry Chichkov for reporting this. Futher thanks to Aleksey Sanin. +Thanks to Dmitry Chichkov for reporting this. Further thanks to Aleksey Sanin. * Fixed realloc(0, <size>) segfaulting. Thanks to Dmitry Chichkov for reporting this. * Made config defines #ifndef so they can be overridden by the build system.
compat/nedmalloc/malloc.c.h +3 -3
@@ -4778,7 +4778,7 @@ void* dlmalloc(size_t bytes) {void dlfree (void * mem) {/* -Consolidate freed chunks with preceeding or succeeding bordering +Consolidate freed chunks with preceding or succeeding bordering free chunks, if they exist, and then place in a bin. Intermixed with special cases for top, dv, mmapped chunks, and usage errors. */
@@ -5680,10 +5680,10 @@ History: Wolfram Gloger ([email protected]). * Use last_remainder in more cases. * Pack bins using idea from [email protected] - * Use ordered bins instead of best-fit threshhold + * Use ordered bins instead of best-fit threshold * Eliminate block-local decls to simplify tracing and debugging. * Support another case of realloc via move into top - * Fix error occuring when initial sbrk_base not word-aligned. + * Fix error occurring when initial sbrk_base not word-aligned. * Rely on page size for units instead of SBRK_UNIT to avoid surprises about sbrk alignment conventions. * Add mallinfo, mallopt. Thanks to Raymond Nijssen
compat/obstack.h +1 -1
@@ -128,7 +128,7 @@ extern "C" {#define __BPTR_ALIGN (B ,P ,A ) ((B) + (((P) - (B) + (A)) & ~(A))) -/* Similiar to _BPTR_ALIGN (B, P, A), except optimize the common case +/* Similar to _BPTR_ALIGN (B, P, A), except optimize the common case where pointers can be converted to integers, aligned as integers, and converted back again. If PTR_INT_TYPE is narrower than a pointer (e.g., the AS/400), play it safe and compute the alignment
compat/precompose_utf8.c +1 -1
@@ -134,7 +134,7 @@ struct dirent_prec_psx *precompose_utf8_readdir(PREC_DIR *prec_dir)if (prec_dir->ic_precompose == (iconv_t)-1 ) {die ("iconv_open(%s,%s) failed, but needed:\n" " precomposed unicode is not supported.\n" -" If you wnat to use decomposed unicode, run\n" +" If you want to use decomposed unicode, run\n" " \"git config core.precomposeunicode false\"\n" , repo_encoding, path_encoding); }else {
compat/regex/regcomp.c +2 -2
@@ -2095,7 +2095,7 @@ peek_token_bracket (re_token_t *token, re_string_t *input, reg_syntax_t syntax)/* Entry point of the parser. Parse the regular expression REGEXP and return the structure tree. -If an error is occured, ERR is set by error code, and return NULL. +If an error has occurred, ERR is set by error code, and return NULL. This function build the following tree, from regular expression <reg_exp>: CAT / \
@@ -3715,7 +3715,7 @@ build_charclass_op (re_dfa_t *dfa, RE_TRANSLATE_TYPE trans,/* This is intended for the expressions like "a{1,3}". Fetch a number from `input', and return the number. Return -1, if the number field is empty like "{,1}". -Return -2, If an error is occured. */ +Return -2, if an error has occurred. */ static int fetch_number (re_string_t *input,re_token_t *token,reg_syntax_t syntax)
compat/regex/regex.c +1 -1
@@ -22,7 +22,7 @@#include "config.h" #endif -/* Make sure noone compiles this code with a C++ compiler. */ +/* Make sure no one compiles this code with a C++ compiler. */ #ifdef __cplusplus# error "This is C code, use a C compiler"#endif
compat/regex/regex_internal.c +3 -3
@@ -1284,7 +1284,7 @@ re_node_set_merge (re_node_set *dest, const re_node_set *src)/* Insert the new element ELEM to the re_node_set* SET. SET should not already have ELEM. -return -1 if an error is occured, return 1 otherwise. */ +return -1 if an error has occurred, return 1 otherwise. */ static int internal_function
@@ -1341,7 +1341,7 @@ re_node_set_insert (re_node_set *set, int elem)/* Insert the new element ELEM to the re_node_set* SET. SET should not already have any element greater than or equal to ELEM. -Return -1 if an error is occured, return 1 otherwise. */ +Return -1 if an error has occurred, return 1 otherwise. */ static int internal_function
@@ -1416,7 +1416,7 @@ re_node_set_remove_at (re_node_set *set, int idx)/* Add the token TOKEN to dfa->nodes, and return the index of the token. -Or return -1, if an error will be occured. */ +Or return -1, if an error has occurred. */ static int internal_function
contrib/mw-to-git/git-remote-mediawiki.perl +3 -3
@@ -28,7 +28,7 @@ use warnings; use constant SLASH_REPLACEMENT => "%2F"; # It's not always possible to delete pages (may require some -# priviledges). Deleted pages are replaced with this content. +# privileges). Deleted pages are replaced with this content. use constant DELETED_CONTENT => "[[Category:Deleted]]\n"; # It's not possible to create empty pages. New empty files in Git are
@@ -841,7 +841,7 @@ sub mw_import_ref { if ($fetch_from == 1 && $n == 0) { print STDERR "You appear to have cloned an empty MediaWiki.\n"; # Something has to be done remote-helper side. If nothing is done, an error is - # thrown saying that HEAD is refering to unknown object 0000000000000000000 + # thrown saying that HEAD is referring to unknown object 0000000000000000000 # and the clone fails. } }
@@ -1067,7 +1067,7 @@ sub mw_push_file { my $file_content; if ($page_deleted) { # Deleting a page usually requires - # special priviledges. A common + # special privileges. A common # convention is to replace the page # with this content instead: $file_content = DELETED_CONTENT;
contrib/mw-to-git/t/README +3 -3
@@ -25,7 +25,7 @@ Principles and Technical Choices The test environment makes it easy to install and manipulate one or several MediaWiki instances. To allow developers to run the testsuite -easily, the environment does not require root priviledge (except to +easily, the environment does not require root privilege (except to install the required packages if needed). It starts a webserver instance on the user's account (using lighttpd greatly helps for that), and does not need a separate database daemon (thanks to the use
@@ -81,7 +81,7 @@ parameters, please refer to the `test-gitmw-lib.sh` and ** `test_check_wiki_precond`: Check if the tests must be skipped or not. Please use this function -at the beggining of each new test file. +at the beginning of each new test file. ** `wiki_getpage`: Fetch a given page from the wiki and puts its content in the
@@ -113,7 +113,7 @@ Tests if a given page exists on the wiki. ** `wiki_reset`: Reset the wiki, i.e. flush the database. Use this function at the -begining of each new test, except if the test re-uses the same wiki +beginning of each new test, except if the test re-uses the same wiki (and history) as the previous test. How to write a new test
contrib/mw-to-git/t/install-wiki/LocalSettings.php +1 -1
@@ -88,7 +88,7 @@ $wgShellLocale = "en_US.utf8"; ## Set $wgCacheDirectory to a writable directory on the web server ## to make your wiki go slightly faster. The directory should not -## be publically accessible from the web. +## be publicly accessible from the web. #$wgCacheDirectory = "$IP/cache"; # Site language code, should be one of the list in ./languages/Names.php
contrib/mw-to-git/t/t9360-mw-to-git-clone.sh +1 -1
@@ -125,7 +125,7 @@ test_expect_success 'Git clone works with one specific page cloned ' ' wiki_editpage foo "I will not be cloned" false && wiki_editpage bar "Do not clone me" false && wiki_editpage namnam "I will be cloned :)" false -s="this log must stay" && - wiki_editpage nyancat "nyan nyan nyan you cant clone me" false && + wiki_editpage nyancat "nyan nyan nyan you cannot clone me" false && git clone -c remote.origin.pages=namnam \ mediawiki::'"$WIKI_URL"' mw_dir_8 && test_contains_N_files mw_dir_8 1 &&
contrib/mw-to-git/t/t9362-mw-to-git-utf8.sh +7 -7
@@ -139,7 +139,7 @@ test_expect_success 'character $ in file name (git -> mw) ' ' ' -test_expect_failure 'capital at the begining of file names' ' +test_expect_failure 'capital at the beginning of file names' ' wiki_reset && git clone mediawiki::'"$WIKI_URL"' mw_dir_10 && (
@@ -156,7 +156,7 @@ test_expect_failure 'capital at the begining of file names' ' ' -test_expect_failure 'special character at the begining of file name from mw to git' ' +test_expect_failure 'special character at the beginning of file name from mw to git' ' wiki_reset && git clone mediawiki::'"$WIKI_URL"' mw_dir_11 && wiki_editpage {char_1 "expect to be renamed {char_1" false &&
@@ -189,7 +189,7 @@ test_expect_success 'Push page with title containing ":" other than namespace se wiki_page_exist NotANameSpace:Page ' -test_expect_success 'test of correct formating for file name from mw to git' ' +test_expect_success 'test of correct formatting for file name from mw to git' ' wiki_reset && git clone mediawiki::'"$WIKI_URL"' mw_dir_12 && wiki_editpage char_%_7b_1 "expect to be renamed char{_1" false &&
@@ -207,7 +207,7 @@ test_expect_success 'test of correct formating for file name from mw to git' ' ' -test_expect_failure 'test of correct formating for file name begining with special character' ' +test_expect_failure 'test of correct formatting for file name beginning with special character' ' wiki_reset && git clone mediawiki::'"$WIKI_URL"' mw_dir_13 && (
@@ -215,7 +215,7 @@ test_expect_failure 'test of correct formating for file name begining with speci echo "my new file {char_1" >\{char_1.mw && echo "my new file [char_2" >\[char_2.mw && git add . && - git commit -am "commiting some exotic file name..." && + git commit -am "committing some exotic file name..." && git push && git pull ) &&
@@ -226,7 +226,7 @@ test_expect_failure 'test of correct formating for file name begining with speci ' -test_expect_success 'test of correct formating for file name from git to mw' ' +test_expect_success 'test of correct formatting for file name from git to mw' ' wiki_reset && git clone mediawiki::'"$WIKI_URL"' mw_dir_14 && (
@@ -234,7 +234,7 @@ test_expect_success 'test of correct formating for file name from git to mw' ' echo "my new file char{_1" >Char\{_1.mw && echo "my new file char[_2" >Char\[_2.mw && git add . && - git commit -m "commiting some exotic file name..." && + git commit -m "committing some exotic file name..." && git push ) && wiki_getallpage ref_page_14 &&
contrib/subtree/t/t7900-subtree.sh +1 -1
@@ -419,7 +419,7 @@ test_expect_success 'add main-sub5' ' test_expect_success 'split for main-sub5 without --onto' ' # also test that we still can split out an entirely new subtree # if the parent of the first commit in the tree is not empty, - # then the new subtree has accidently been attached to something + # then the new subtree has accidentally been attached to something git subtree split --prefix subdir2 --branch mainsub5 && check_equal ''"$(git log --pretty=format:%P -1 mainsub5)"'' "" '
diff.c +1 -1
@@ -1565,7 +1565,7 @@ static void show_stats(struct diffstat_t *data, struct diff_options *options)* Binary files are displayed with "Bin XXX -> YYY bytes" * instead of the change count and graph. This part is treated * similarly to the graph part, except that it is not -* "scaled". If total width is too small to accomodate the +* "scaled". If total width is too small to accommodate the * guaranteed minimum width of the filename part and the * separators and this message, this message will "overflow" * making the line longer than the maximum width.
git-add--interactive.perl +1 -1
@@ -1247,7 +1247,7 @@ sub summarize_hunk { # Print a one-line summary of each hunk in the array ref in -# the first argument, starting wih the index in the 2nd. +# the first argument, starting with the index in the 2nd. sub display_hunks { my ($hunks, $i) = @_; my $ctr = 0;
git-cvsserver.perl +2 -2
@@ -2911,7 +2911,7 @@ sub filenamesplit } # Cleanup various junk in filename (try to canonicalize it), and -# add prependdir to accomodate running CVS client from a +# add prependdir to accommodate running CVS client from a # subdirectory (so the output is relative to top directory of the project). sub filecleanup {
@@ -4583,7 +4583,7 @@ sub getmeta # the numerical value of the corresponding byte plus # 100. # - "plus 100" avoids "0"s, and also reduces the - # likelyhood of a collision in the case that someone someday + # likelihood of a collision in the case that someone someday # writes an import tool that tries to preserve original # CVS revision numbers, and the original CVS data had done # lots of branches off of branches and other strangeness to
git-gui/lib/blame.tcl +1 -1
@@ -5,7 +5,7 @@ class blame { image create photo ::blame::img_back_arrow -data {R0lGODlhGAAYAIUAAPwCBEzKXFTSZIz+nGzmhGzqfGTidIT+nEzGXHTqhGzmfGzifFzadETCVES+VARWDFzWbHzyjAReDGTadFTOZDSyRDyyTCymPARaFGTedFzSbDy2TCyqRCyqPARaDAyCHES6VDy6VCyiPAR6HCSeNByWLARyFARiDARqFGTifARiFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAYABgAAAajQIBwSCwaj8ikcsk0BppJwRPqHEypQwHBis0WDAdEFyBIKBaMAKLBdjQeSkFBYTBAIvgEoS6JmhUTEwIUDQ4VFhcMGEhyCgoZExoUaxsWHB0THkgfAXUGAhoBDSAVFR0XBnCbDRmgog0hpSIiDJpJIyEQhBUcJCIlwA22SSYVogknEg8eD82qSigdDSknY0IqJQXPYxIl1dZCGNvWw+Dm510GQQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7} -# Persistant data (survives loads) +# Persistent data (survives loads) # field history {}; # viewer history: {commit path} field header ; # array commit,key -> header field
git-gui/lib/index.tcl +1 -1
@@ -414,7 +414,7 @@ proc revert_helper {txt paths} { # such distinction is needed in some languages. Previously, the # code used "Revert changes in" for both, but that can't work # in languages where 'in' must be combined with word from - # rest of string (in diffrent way for both cases of course). + # rest of string (in different way for both cases of course). # # FIXME: Unfortunately, even that isn't enough in some languages # as they have quite complex plural-form rules. Unfortunately,
git-gui/lib/spellcheck.tcl +2 -2
@@ -14,7 +14,7 @@ field w_menu ; # context menu for the widget field s_menuidx 0 ; # last index of insertion into $w_menu field s_i {} ; # timer registration for _run callbacks -field s_clear 0 ; # did we erase mispelled tags yet? +field s_clear 0 ; # did we erase misspelled tags yet? field s_seen [list] ; # lines last seen from $w_text in _run field s_checked [list] ; # lines already checked field s_pending [list] ; # [$line $data] sent to ispell/aspell
@@ -259,7 +259,7 @@ method _run {} { if {$n == $cur_line && ![regexp {^\W$} [$w_text get $cur_pos insert]]} { - # If the current word is mispelled remove the tag + # If the current word is misspelled remove the tag # but force a spellcheck later. # set tags [$w_text tag names $cur_pos]
git-quiltimport.sh +1 -1
@@ -59,7 +59,7 @@ tmp_patch="$tmp_dir/patch" tmp_info="$tmp_dir/info" -# Find the intial commit +# Find the initial commit commit=$(git rev-parse HEAD) mkdir $tmp_dir || exit 2
gitweb/INSTALL +1 -1
@@ -244,7 +244,7 @@ for gitweb (in gitweb/README), and gitweb.conf(5) manpage. through the GITWEB_CONFIG_SYSTEM environment variable. Note that if per-instance configuration file exists, then system-wide - configuration is _not used at all_. This is quite untypical and suprising + configuration is _not used at all_. This is quite untypical and surprising behavior. On the other hand changing current behavior would break backwards compatibility and can lead to unexpected changes in gitweb behavior. Therefore gitweb also looks for common system-wide configuration file,
gitweb/gitweb.perl +3 -3
@@ -683,7 +683,7 @@ sub evaluate_gitweb_config { our $GITWEB_CONFIG_SYSTEM = $ENV{'GITWEB_CONFIG_SYSTEM'} || "++GITWEB_CONFIG_SYSTEM++"; our $GITWEB_CONFIG_COMMON = $ENV{'GITWEB_CONFIG_COMMON'} || "++GITWEB_CONFIG_COMMON++"; - # Protect agains duplications of file names, to not read config twice. + # Protect against duplications of file names, to not read config twice. # Only one of $GITWEB_CONFIG and $GITWEB_CONFIG_SYSTEM is used, so # there possibility of duplication of filename there doesn't matter. $GITWEB_CONFIG = "" if ($GITWEB_CONFIG eq $GITWEB_CONFIG_COMMON);
@@ -1136,7 +1136,7 @@ sub handle_errors_html { # to avoid infinite loop where error occurs in die_error, # change handler to default handler, disabling handle_errors_html - set_message("Error occured when inside die_error:\n$msg"); + set_message("Error occurred when inside die_error:\n$msg"); # you cannot jump out of die_error when called as error handler; # the subroutine set via CGI::Carp::set_message is called _after_
@@ -7485,7 +7485,7 @@ sub git_object { system(git_cmd(), "cat-file", '-e', $hash_base) == 0 or die_error(404, "Base object does not exist"); - # here errors should not hapen + # here errors should not happen open my $fd, "-|", git_cmd(), "ls-tree", $hash_base, "--", $file_name or die_error(500, "Open git-ls-tree failed"); my $line = <$fd>;
kwset.c +2 -2
@@ -26,7 +26,7 @@The author may be reached (Email) at the address [email protected], or (US mail) as Mike Haertel c/o Free Software Foundation. */ -/* The algorithm implemented by these routines bears a startling resemblence +/* The algorithm implemented by these routines bears a startling resemblance to one discovered by Beate Commentz-Walter, although it is not identical. See "A String Matching Algorithm Fast on the Average," Technical Report, IBM-Germany, Scientific Center Heidelberg, Tiergartenstrasse 15, D-6900
@@ -435,7 +435,7 @@ kwsprep (kwset_t kws)/* Update the delta table for the descendents of this node. */ treedelta (curr->links, curr->depth, delta); -/* Compute the failure function for the decendents of this node. */ +/* Compute the failure function for the descendants of this node. */ treefails (curr->links, curr->fail, kwset->trie);/* Update the shifts at each node in the current node's chain
perl/Git.pm +1 -1
@@ -1180,7 +1180,7 @@ my (%TEMP_FILEMAP, %TEMP_FILES); =item temp_acquire ( NAME ) -Attempts to retreive the temporary file mapped to the string C<NAME>. If an +Attempts to retrieve the temporary file mapped to the string C<NAME>. If an associated temp file has not been created this session or was closed, it is created, cached, and set for autoflush and binmode.
perl/Git/I18N.pm +1 -1
@@ -68,7 +68,7 @@ Git::I18N - Perl interface to Git's Gettext localizations print __("Welcome to Git!\n"); - printf __("The following error occured: %s\n"), $error; + printf __("The following error occurred: %s\n"), $error; =head1 DESCRIPTION
perl/private-Error.pm +1 -1
@@ -769,7 +769,7 @@ is a numeric value. These values are what will be returned by the overload methods. If the text value ends with C<at file line 1> as $@ strings do, then -this infomation will be used to set the C<-file> and C<-line> arguments +this information will be used to set the C<-file> and C<-line> arguments of the error object. This class is used internally if an eval'd block die's with an error
po/README +3 -3
@@ -232,7 +232,7 @@ Shell: # To interpolate variables: details="oh noes" - eval_gettext "An error occured: \$details"; echo + eval_gettext "An error occurred: \$details"; echo In addition we have wrappers for messages that end with a trailing newline. I.e. you could write the above as:
@@ -242,7 +242,7 @@ Shell: # To interpolate variables: details="oh noes" - eval_gettextln "An error occured: \$details" + eval_gettextln "An error occurred: \$details" More documentation about the interface is available in the GNU info page: `info '(gettext)sh'`. Looking at git-am.sh (the first shell
@@ -257,7 +257,7 @@ Perl: use Git::I18N; print __("Welcome to Git!\n"); - printf __("The following error occured: %s\n"), $error; + printf __("The following error occurred: %s\n"), $error; Run `perldoc perl/Git/I18N.pm` for more info.
sequencer.c +1 -1
@@ -216,7 +216,7 @@ static void print_advice(int show_hint, struct replay_opts *opts)if (msg) {fprintf (stderr,"%s\n" , msg);/* -* A conflict has occured but the porcelain +* A conflict has occurred but the porcelain * (typically rebase --interactive) wants to take care * of the commit itself so remove CHERRY_PICK_HEAD */
t/t1006-cat-file.sh +1 -1
@@ -116,7 +116,7 @@ tree_pretty_content="100644 blob $hello_sha1 hello" run_tests 'tree' $tree_sha1 $tree_size "" "$tree_pretty_content" -commit_message="Intial commit" +commit_message="Initial commit" commit_sha1=$(echo_without_newline "$commit_message" | git commit-tree $tree_sha1) commit_size=176 commit_content="tree $tree_sha1
t/t3511-cherry-pick-x.sh +2 -2
@@ -133,7 +133,7 @@ test_expect_success 'cherry-pick -x -s inserts blank line when conforming footer test_cmp expect actual ' -test_expect_success 'cherry-pick -s adds sob when last sob doesnt match committer' ' +test_expect_success 'cherry-pick -s adds sob when last sob does not match committer' ' pristine_detach initial && git cherry-pick -s mesg-with-footer && cat <<-EOF >expect &&
@@ -144,7 +144,7 @@ test_expect_success 'cherry-pick -s adds sob when last sob doesnt match committe test_cmp expect actual ' -test_expect_success 'cherry-pick -x -s adds sob when last sob doesnt match committer' ' +test_expect_success 'cherry-pick -x -s adds sob when last sob does not match committer' ' pristine_detach initial && sha1=`git rev-parse mesg-with-footer^0` && git cherry-pick -x -s mesg-with-footer &&
t/t3701-add-interactive.sh +1 -1
@@ -319,7 +319,7 @@ test_expect_success PERL 'split hunk "add -p (edit)"' ' # times to get out. # # 2. Correct version applies the (not)edited version, and asks - # about the next hunk, against wich we say q and program + # about the next hunk, against which we say q and program # exits. for a in s e q n q q do
t/t4014-format-patch.sh +3 -3
@@ -742,21 +742,21 @@ test_expect_success 'format-patch --signature --cover-letter' ' test 2 = $(grep "my sig" output | wc -l) ' -test_expect_success 'format.signature="" supresses signatures' ' +test_expect_success 'format.signature="" suppresses signatures' ' git config format.signature "" && git format-patch --stdout -1 >output && check_patch output && ! grep "^-- \$" output ' -test_expect_success 'format-patch --no-signature supresses signatures' ' +test_expect_success 'format-patch --no-signature suppresses signatures' ' git config --unset-all format.signature && git format-patch --stdout --no-signature -1 >output && check_patch output && ! grep "^-- \$" output ' -test_expect_success 'format-patch --signature="" supresses signatures' ' +test_expect_success 'format-patch --signature="" suppresses signatures' ' git format-patch --stdout --signature="" -1 >output && check_patch output && ! grep "^-- \$" output
t/t4124-apply-ws-rule.sh +1 -1
@@ -47,7 +47,7 @@ test_fix () { # find touched lines $DIFF file target | sed -n -e "s/^> //p" >fixed - # the changed lines are all expeced to change + # the changed lines are all expected to change fixed_cnt=$(wc -l <fixed) case "$1" in '') expect_cnt=$fixed_cnt ;;
t/t6030-bisect-porcelain.sh +1 -1
@@ -190,7 +190,7 @@ test_expect_success 'bisect start: no ".git/BISECT_START" if checkout error' ' # $HASH1 is good, $HASH4 is bad, we skip $HASH3 # but $HASH2 is bad, # so we should find $HASH2 as the first bad commit -test_expect_success 'bisect skip: successfull result' ' +test_expect_success 'bisect skip: successful result' ' git bisect reset && git bisect start $HASH4 $HASH1 && git bisect skip &&
t/t7601-merge-pull-config.sh +1 -1
@@ -109,7 +109,7 @@ test_expect_success 'setup conflicted merge' ' ' # First do the merge with resolve and recursive then verify that -# recusive is choosen. +# recusive is chosen. test_expect_success 'merge picks up the best result' ' git config --unset-all pull.twohead &&
t/t7610-mergetool.sh +1 -1
@@ -237,7 +237,7 @@ test_expect_success 'mergetool takes partial path' ' git submodule update -N && test_must_fail git merge master && - #shouldnt need these lines + #should not need these lines #( yes "d" | git mergetool file11 >/dev/null 2>&1 ) && #( yes "d" | git mergetool file12 >/dev/null 2>&1 ) && #( yes "l" | git mergetool submod >/dev/null 2>&1 ) &&
t/t9001-send-email.sh +2 -2
@@ -101,7 +101,7 @@ test_expect_success $PREREQ \ test_expect_success $PREREQ 'Send patches with --envelope-sender' ' clean_fake_sendmail && - git send-email --envelope-sender="Patch Contributer <[email protected]>" --suppress-cc=sob --from="Example <[email protected]>" [email protected] --smtp-server="$(pwd)/fake.sendmail" $patches 2>errors + git send-email --envelope-sender="Patch Contributor <[email protected]>" --suppress-cc=sob --from="Example <[email protected]>" [email protected] --smtp-server="$(pwd)/fake.sendmail" $patches 2>errors ' test_expect_success $PREREQ 'setup expect' '
@@ -787,7 +787,7 @@ test_expect_success $PREREQ 'confirm detects EOF (auto causes failure)' ' test $ret = "0" ' -test_expect_success $PREREQ 'confirm doesnt loop forever' ' +test_expect_success $PREREQ 'confirm does not loop forever' ' CONFIRM=$(git config --get sendemail.confirm) && git config sendemail.confirm auto && GIT_SEND_EMAIL_NOTTY=1 &&
transport-helper.c +1 -1
@@ -991,7 +991,7 @@ struct unidirectional_transfer {int src_is_sock;/* Is destination socket? */ int dest_is_sock; -/* Transfer state (TRANSFERING/FLUSHING/FINISHED) */ +/* Transfer state (TRANSFERRING/FLUSHING/FINISHED) */ int state;/* Buffer. */ char buf[BUFFERSIZE ];
transport.h +1 -1
@@ -74,7 +74,7 @@ struct transport { const char *executable, int fd[2]);/** get_refs_list(), fetch(), and push_refs() can keep -* resources (such as a connection) reserved for futher +* resources (such as a connection) reserved for further * use. disconnect() releases these resources. **/ int (*disconnect)(struct transport *connection);
xdiff/xdiffi.c +1 -1
@@ -490,7 +490,7 @@ int xdl_change_compact(xdfile_t *xdf, xdfile_t *xdfo, long flags) {/* * Try to move back the possibly merged group of changes, to match -* the recorded postion in the other file. +* the recorded position in the other file. */ while (ixref < ix) { rchg[--ixs] =1 ;
xdiff/xhistogram.c +1 -1
@@ -55,7 +55,7 @@ struct histindex {struct record {unsigned int ptr, cnt;struct record *next; - } **records,/* an ocurrence */ + } **records,/* an occurrence */ **line_map;/* map of line to record chain */ chastore_t rcha;unsigned int *next_ptrs;
Signature · 1 line
1.8.2.373.g961c512
Re: [PATCH v2] Fix various typos and grammaros
Quoted 44 lines · Stefano Lattarini
Documentation/git-credential.txt | 2 +- Documentation/git-remote-ext.txt | 2 +- Documentation/git-svn.txt | 4 ++-- Documentation/git-tools.txt | 2 +- Documentation/revisions.txt | 2 +- Documentation/technical/api-argv-array.txt | 2 +- Documentation/technical/api-credentials.txt | 2 +- Documentation/technical/api-ref-iteration.txt | 2 +- builtin/apply.c | 6 +++--- commit.c | 2 +- commit.h | 2 +- compat/nedmalloc/Readme.txt | 2 +- compat/nedmalloc/malloc.c.h | 6 +++--- compat/obstack.h | 2 +- compat/precompose_utf8.c | 2 +- compat/regex/regcomp.c | 4 ++-- compat/regex/regex.c | 2 +- compat/regex/regex_internal.c | 6 +++--- contrib/mw-to-git/git-remote-mediawiki.perl | 6 +++--- contrib/mw-to-git/t/README | 6 +++--- contrib/mw-to-git/t/install-wiki/LocalSettings.php | 2 +- contrib/mw-to-git/t/t9360-mw-to-git-clone.sh | 2 +- contrib/mw-to-git/t/t9362-mw-to-git-utf8.sh | 14 +++++++------- contrib/subtree/t/t7900-subtree.sh | 2 +- diff.c | 2 +- git-add--interactive.perl | 2 +- git-cvsserver.perl | 4 ++-- git-gui/lib/blame.tcl | 2 +- git-gui/lib/index.tcl | 2 +- git-gui/lib/spellcheck.tcl | 4 ++-- git-quiltimport.sh | 2 +- gitweb/INSTALL | 2 +- gitweb/gitweb.perl | 6 +++--- kwset.c | 4 ++-- perl/Git.pm | 2 +- perl/Git/I18N.pm | 2 +- perl/private-Error.pm | 2 +- po/README | 6 +++--- sequencer.c | 2 +- t/t1006-cat-file.sh | 2 +- t/t3511-cherry-pick-x.sh | 4 ++-- t/t3701-add-interactive.sh | 2 +- t/t4014-format-patch.sh | 6 +++--- t/t4124-apply-ws-rule.sh | 2 +-
Quoted 8 lines
t/t6030-bisect-porcelain.sh | 2 +- t/t7601-merge-pull-config.sh | 2 +- t/t7610-mergetool.sh | 2 +- t/t9001-send-email.sh | 4 ++-- transport-helper.c | 2 +- transport.h | 2 +- xdiff/xdiffi.c | 2 +- xdiff/xhistogram.c | 2 +-
How much of this stuff have interact with real changes that are in flight, with various doneness cooking in different integration branches?
[RFC/PATCH maint 0/10] Re: [PATCH v2] Fix various typos and grammaros
Hi,
Quoted 3 lines · Junio C Hamano
How much of this stuff have interact with real changes that are in flight, with various doneness cooking in different integration branches?
All except the t3511-cherry-pick-x.sh change apply cleanly to "maint" and merge without trouble with master and pu.
Here is a split-up version. I haven't looked closely at the patch, even to sanity check it --- one of the main points of splitting it this way is to make it easier to review with reference to code borrowed from other projects.
I left out the change to compat/nedmalloc/Readme.txt, since it is changing a historical record, and to contrib/mw-to-git/t/t9360-mw-to-git-clone.sh, because it seems realistic to allow the nyan cat to demonstrate poor punctuation skills.
Some of these patches need more work if they are to be applied. For example, git-gui is maintained separately and should not be patched from the toplevel.
Hope that helps,
Jonathan
Stefano Lattarini (10):
doc: various spelling fixes
git-remote-mediawiki: spelling fixes contrib/subtree: fix spelling of "accidentally"
obstack: fix spelling of "similar" compat/regex: fix spelling and grammar in comments compat/nedmalloc: fix spelling in comments
precompose-utf8: fix spelling of "want" in error message
kwset: fix spelling in comments
git-gui: fix spelling in comments
Correct common spelling mistakes in comments and tests
Documentation/git-credential.txt | 2 +- Documentation/git-remote-ext.txt | 2 +- Documentation/git-svn.txt | 4 ++-- Documentation/git-tools.txt | 2 +- Documentation/revisions.txt | 2 +- Documentation/technical/api-argv-array.txt | 2 +- Documentation/technical/api-credentials.txt | 2 +- Documentation/technical/api-ref-iteration.txt | 2 +- builtin/apply.c | 6 +++--- commit.c | 2 +- commit.h | 2 +- compat/nedmalloc/malloc.c.h | 6 +++--- compat/obstack.h | 2 +- compat/precompose_utf8.c | 2 +- compat/regex/regcomp.c | 4 ++-- compat/regex/regex.c | 2 +- compat/regex/regex_internal.c | 6 +++--- contrib/mw-to-git/git-remote-mediawiki.perl | 6 +++--- contrib/mw-to-git/t/README | 6 +++--- contrib/mw-to-git/t/install-wiki/LocalSettings.php | 2 +- contrib/mw-to-git/t/t9362-mw-to-git-utf8.sh | 14 +++++++------- contrib/subtree/t/t7900-subtree.sh | 2 +- diff.c | 2 +- git-add--interactive.perl | 2 +- git-cvsserver.perl | 4 ++-- git-gui/lib/blame.tcl | 2 +- git-gui/lib/index.tcl | 2 +- git-gui/lib/spellcheck.tcl | 4 ++-- git-quiltimport.sh | 2 +- gitweb/INSTALL | 2 +- gitweb/gitweb.perl | 6 +++--- kwset.c | 4 ++-- perl/Git.pm | 2 +- perl/Git/I18N.pm | 2 +- perl/private-Error.pm | 2 +- po/README | 6 +++--- sequencer.c | 2 +- t/t1006-cat-file.sh | 2 +- t/t3701-add-interactive.sh | 2 +- t/t4014-format-patch.sh | 6 +++--- t/t4124-apply-ws-rule.sh | 2 +- t/t6030-bisect-porcelain.sh | 2 +- t/t7601-merge-pull-config.sh | 2 +- t/t7610-mergetool.sh | 2 +- t/t9001-send-email.sh | 4 ++-- transport-helper.c | 2 +- transport.h | 2 +- xdiff/xdiffi.c | 2 +- xdiff/xhistogram.c | 2 +- 49 files changed, 77 insertions(+), 77 deletions(-)
PATCH 1/10 doc: various spelling fixes
From: Stefano Lattarini <[email protected]>
Date: Fri, 12 Apr 2013 00:36:10 +0200
Most of these were found using Lucas De Marchi's codespell tool.
Signed-off-by Stefano Lattarini <[email protected]>
Signed-off-by Jonathan Nieder <[email protected]>
---
I like this one.
Documentation/git-credential.txt | 2 +- Documentation/git-remote-ext.txt | 2 +- Documentation/git-svn.txt | 4 ++-- Documentation/git-tools.txt | 2 +- Documentation/revisions.txt | 2 +- Documentation/technical/api-argv-array.txt | 2 +- Documentation/technical/api-credentials.txt | 2 +- Documentation/technical/api-ref-iteration.txt | 2 +- gitweb/INSTALL | 2 +- po/README | 6 +++--- 10 files changed, 13 insertions(+), 13 deletions(-)
Documentation/git-credential.txt +1 -1
@@ -56,7 +56,7 @@ For example, if we want a password for `https://example.com/foo.git`, we might generate the following credential description (don't forget the blank line at the end; it tells `git credential` that the application finished feeding all the -infomation it has): +information it has): protocol=https host=example.com
Documentation/git-remote-ext.txt +1 -1
@@ -86,7 +86,7 @@ begins with `ext::`. Examples: edit .ssh/config. "ext::socat -t3600 - ABSTRACT-CONNECT:/git-server %G/somerepo":: - Represents repository with path /somerepo accessable over + Represents repository with path /somerepo accessible over git protocol at abstract namespace address /git-server. "ext::git-server-alias foo %G/repo"::
Documentation/git-svn.txt +2 -2
@@ -245,7 +245,7 @@ first have already been pushed into SVN. patch), "all" (accept all patches), or "quit". + 'git svn dcommit' returns immediately if answer if "no" or "quit", without - commiting anything to SVN. + committing anything to SVN. 'branch':: Create a branch in the SVN repository.
@@ -856,7 +856,7 @@ HANDLING OF SVN BRANCHES ------------------------ If 'git svn' is configured to fetch branches (and --follow-branches is in effect), it sometimes creates multiple Git branches for one -SVN branch, where the addtional branches have names of the form +SVN branch, where the additional branches have names of the form 'branchname@nnn' (with nnn an SVN revision number). These additional branches are created if 'git svn' cannot find a parent commit for the first commit in an SVN branch, to connect the branch to the history of
Documentation/git-tools.txt +1 -1
@@ -109,7 +109,7 @@ Others - *git.el* (contrib/) - This is an Emacs interface for Git. The user interface is modeled on + This is an Emacs interface for Git. The user interface is modelled on pcl-cvs. It has been developed on Emacs 21 and will probably need some tweaking to work on XEmacs.
Documentation/revisions.txt +1 -1
@@ -55,7 +55,7 @@ when you run `git cherry-pick`. + Note that any of the 'refs/*' cases above may come either from the '$GIT_DIR/refs' directory or from the '$GIT_DIR/packed-refs' file. -While the ref name encoding is unspecified, UTF-8 is prefered as +While the ref name encoding is unspecified, UTF-8 is preferred as some output processing may assume ref names in UTF-8. '<refname>@\{<date>\}', e.g. 'master@\{yesterday\}', 'HEAD@\{5 minutes ago\}'::
Documentation/technical/api-argv-array.txt +1 -1
@@ -55,7 +55,7 @@ Functions initial, empty state. `argv_array_detach`:: - Detach the argv array from the `struct argv_array`, transfering + Detach the argv array from the `struct argv_array`, transferring ownership of the allocated array and strings. `argv_array_free_detached`::
Documentation/technical/api-credentials.txt +1 -1
@@ -160,7 +160,7 @@ int foo_login(struct foo_connection *f) break; default: /* - * Some other error occured. We don't know if the + * Some other error occurred. We don't know if the * credential is good or bad, so report nothing to the * credential subsystem. */
Documentation/technical/api-ref-iteration.txt +1 -1
@@ -35,7 +35,7 @@ Iteration functions * `head_ref_submodule()`, `for_each_ref_submodule()`, `for_each_ref_in_submodule()`, `for_each_tag_ref_submodule()`, `for_each_branch_ref_submodule()`, `for_each_remote_ref_submodule()` - do the same as the functions descibed above but for a specified + do the same as the functions described above but for a specified submodule. * `for_each_rawref()` can be used to learn about broken ref and symref.
gitweb/INSTALL +1 -1
@@ -244,7 +244,7 @@ for gitweb (in gitweb/README), and gitweb.conf(5) manpage. through the GITWEB_CONFIG_SYSTEM environment variable. Note that if per-instance configuration file exists, then system-wide - configuration is _not used at all_. This is quite untypical and suprising + configuration is _not used at all_. This is quite untypical and surprising behavior. On the other hand changing current behavior would break backwards compatibility and can lead to unexpected changes in gitweb behavior. Therefore gitweb also looks for common system-wide configuration file,
po/README +3 -3
@@ -232,7 +232,7 @@ Shell: # To interpolate variables: details="oh noes" - eval_gettext "An error occured: \$details"; echo + eval_gettext "An error occurred: \$details"; echo In addition we have wrappers for messages that end with a trailing newline. I.e. you could write the above as:
@@ -242,7 +242,7 @@ Shell: # To interpolate variables: details="oh noes" - eval_gettextln "An error occured: \$details" + eval_gettextln "An error occurred: \$details" More documentation about the interface is available in the GNU info page: `info '(gettext)sh'`. Looking at git-am.sh (the first shell
@@ -257,7 +257,7 @@ Perl: use Git::I18N; print __("Welcome to Git!\n"); - printf __("The following error occured: %s\n"), $error; + printf __("The following error occurred: %s\n"), $error; Run `perldoc perl/Git/I18N.pm` for more info.
Signature · 1 line
1.8.2.1
Re: [PATCH 01/10] doc: various spelling fixes
gitweb/INSTALL for gitweb (in gitweb/README), and gitweb.conf(5) manpage. · line 250
Quoted 6 lines · Jonathan Nieder
Note that if per-instance configuration file exists, then system-wide
gitweb/INSTALL +1
-1- configuration is _not used at all_. This is quite untypical and suprising + configuration is _not used at all_. This is quite untypical and surprising behavior. On the other hand changing current behavior would break backwards compatibility and can lead to unexpected changes in gitweb behavior. Therefore gitweb also looks for common system-wide configuration file,
Hmm, "atypical", isn't it?
The flow of the text is awkward. "This is bad. Oh the other hand, better is broken. Therefore ..." forces readers to make multiple guesses while reading: "ok, bad, so you plan to change it and warn us about upcoming change? oh, not that, changing it is bad, so we have to live with it? oh, not that, there is another one that is common and that is what we can use".
It may be a good idea to rewrite this paragraph to avoid such a mental roller-coaster in the first place.
The GITWEB_CONFIG_SYSTEM system-wide configuration file is only used for instances that lack per-instance configuration file. You can use GITWEB_CONFIG_COMMON file to keep common default settings that apply to all instances.
or something.
Not asking for a re-roll, but it may be a potential follow-up candidate.
Thanks.
PATCH 1/1 gitweb/INSTALL: Simplify description of GITWEB_CONFIG_SYSTEM
Quoted 21 lines · Junio C Hamano
Review
Quoted 6 lines · Jonathan Nieder
Note that if per-instance configuration file exists, then system-wide
(quoted diff) +1
-1- configuration is _not used at all_. This is quite untypical and suprising + configuration is _not used at all_. This is quite untypical and surprising behavior. On the other hand changing current behavior would break backwards compatibility and can lead to unexpected changes in gitweb behavior. Therefore gitweb also looks for common system-wide configuration file,Hmm, "atypical", isn't it?
The flow of the text is awkward. "This is bad. Oh the other hand, better is broken. Therefore ..." forces readers to make multiple guesses while reading: "ok, bad, so you plan to change it and warn us about upcoming change? oh, not that, changing it is bad, so we have to live with it? oh, not that, there is another one that is common and that is what we can use".
It may be a good idea to rewrite this paragraph to avoid such a mental roller-coaster in the first place.
Quoted 8 lines
The
GITWEB_CONFIG_SYSTEMsystem-wide configuration file is only used for instances that lack per-instance configuration file. You can useGITWEB_CONFIG_COMMONfile to keep common default settings that apply to all instances.or something.
Not asking for a re-roll, but it may be a potential follow-up candidate.
Perhaps something like this?
Note that this change avoids repetition of build / environmental configuration variable (I think the paragraph above, not touched in this patch, also might need rewrite).
-- >8 --
Subject: [PATCH] gitweb/INSTALL: Simplify description of GITWEB_CONFIG_SYSTEM
The flow of the text describing GITWEB_CONFIG_SYSTEM and GITWEB_CONFIG_COMMON in gitweb/INSTALL is awkward. "This is bad. Oh the other hand, better is broken. Therefore ..." forces readers to make multiple guesses while reading: "ok, bad, so you plan to change it and warn us about upcoming change? oh, not that, changing it is bad, so we have to live with it? oh, not that, there is another one that is common and that is what we can use".
Better rewrite said paragraph to avoid such a mental roller-coaster in the first place.
Signed-off-by Junio Hamano <[email protected]>
Signed-off-by Jakub Narebski <[email protected]>
--- gitweb/INSTALL | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-)
gitweb/INSTALL +6 -8
@@ -243,14 +243,12 @@ for gitweb (in gitweb/README), and gitweb.conf(5) manpage. GITWEB_CONFIG_SYSTEM build configuration variable, and override it through the GITWEB_CONFIG_SYSTEM environment variable. - Note that if per-instance configuration file exists, then system-wide - configuration is _not used at all_. This is quite untypical and suprising - behavior. On the other hand changing current behavior would break backwards - compatibility and can lead to unexpected changes in gitweb behavior. - Therefore gitweb also looks for common system-wide configuration file, - normally /etc/gitweb-common.conf (set during build time using build time - configuration variable GITWEB_CONFIG_COMMON, set it at runtime using - environment variable with the same name). Settings from per-instance or + + Note that the GITWEB_CONFIG_SYSTEM system-wide configuration file is + only used for instances that lack per-instance configuration file. + You can use GITWEB_CONFIG_COMMON common system-wide configuration + file (normally /etc/gitweb-common.conf) to keep common default + settings that apply to all instances. Settings from per-instance or system-wide configuration file override those from common system-wide configuration file.
Signature · 1 line
1.7.10.4
Re: [PATCH] gitweb/INSTALL: Simplify description of GITWEB_CONFIG_SYSTEM
Quoted 34 lines · Jakub Narębski
-- >8 --
Subject: [PATCH] gitweb/INSTALL: Simplify description ofGITWEB_CONFIG_SYSTEMThe flow of the text describing
GITWEB_CONFIG_SYSTEMandGITWEB_CONFIG_COMMONin gitweb/INSTALL is awkward. "This is bad. Oh the other hand, better is broken. Therefore ..." forces readers to make multiple guesses while reading: "ok, bad, so you plan to change it and warn us about upcoming change? oh, not that, changing it is bad, so we have to live with it? oh, not that, there is another one that is common and that is what we can use".Better rewrite said paragraph to avoid such a mental roller-coaster in the first place.
Signed-off-by Junio Hamano <[email protected]>Signed-off-by Jakub Narebski <[email protected]>--- gitweb/INSTALL | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-)gitweb/INSTALL +0
-6@@ -243,14 +243,12 @@ for gitweb (in gitweb/README), and gitweb.conf(5) manpage. GITWEB_CONFIG_SYSTEM build configuration variable, and override it through the GITWEB_CONFIG_SYSTEM environment variable. - Note that if per-instance configuration file exists, then system-wide - configuration is _not used at all_. This is quite untypical and suprising - behavior. On the other hand changing current behavior would break backwards - compatibility and can lead to unexpected changes in gitweb behavior. - Therefore gitweb also looks for common system-wide configuration file, - normally /etc/gitweb-common.conf (set during build time using build time
gitweb/INSTALL for gitweb (in gitweb/README), and gitweb.conf(5) manpage. · line 253
Quoted 10 lines
gitweb/INSTALL +6
-2- configuration variable GITWEB_CONFIG_COMMON, set it at runtime using - environment variable with the same name). Settings from per-instance or + + Note that the GITWEB_CONFIG_SYSTEM system-wide configuration file is + only used for instances that lack per-instance configuration file. + You can use GITWEB_CONFIG_COMMON common system-wide configuration + file (normally /etc/gitweb-common.conf) to keep common default + settings that apply to all instances. Settings from per-instance or system-wide configuration file override those from common system-wide configuration file.
The point of wording it such that it was explicitly noted that the supposed "system-wide" settings were really just "system-wide defaults" (which would be ignored wholesale if any one setting was overridden locally) was due to the fact that most of the time server administrators don't deal with software that idiosyncratic. Prior to the addition of GITWEB_CONFIG_COMMON there was no method for setting up a sane default template that wouldn't be discarded wholesale upon any one configuration parameter being overridden.
That's the point of explaining SPECIFICALLY why the then current behavior wasn't being replaced, and this other mechanism (which would otherwise have no obvious reason for existing) was being introduced. So, unfortunately, if we remove the "mental roller coaster" part of the explanation entirely we can expect to end up in exactly the situation that I complained about to begin with. (Or we could just do this the way everybody else does, with partial overrides being the common case, starting at 2.x and no longer have the mental roller coaster problem at all.)
As I'm the one that complained loudly enough to get this change to be made in the first place I'd appreciate being kept in the loop in this series.
--
-Drew Northup
--------------------------------------------------------------
"As opposed to vegetable or mineral error?"
-John Pescatore, SANS NewsBites Vol. 12 Num. 59
Re: [PATCH] gitweb/INSTALL: Simplify description of GITWEB_CONFIG_SYSTEM
Quoted 11 lines · Drew Northup
gitweb/INSTALL for gitweb (in gitweb/README), and gitweb.conf(5) manpage. · line 253
Quoted 7 lines
gitweb/INSTALL +5
-0+ Note that the GITWEB_CONFIG_SYSTEM system-wide configuration file is + only used for instances that lack per-instance configuration file. + You can use GITWEB_CONFIG_COMMON common system-wide configuration + file (normally /etc/gitweb-common.conf) to keep common default + settings that apply to all instances. Settings from per-instance or system-wide configuration file override those from common system-wide configuration file.That's the point of explaining SPECIFICALLY why the then current behavior wasn't being replaced, and this other mechanism (which would otherwise have no obvious reason for existing) was being introduced.
In order to just pick and use the more appropriate one (or a useful combination of the two), a clean description of what each of them do without historical cruft is more readable and useful, isn't it? I would expect that most of them who are newly configuring a system would pick COMMON one and override per instance as needed, without touching the SYSTEM one (fallback default) after reading the above, and that is what we want to happen.
Do you think sysadmins need a history lesson to understand why there are two different possibilities?
For example, bash reads some but not all possible configuration files. I would expect .bashrc to be read even for login shells after reading .bash_login; alas, that is not what happens. The manual does not apologize that the authors now know better and understand that it is a stupid behaviour. The order the rc files are read is just described matter-of-factly, and it gives sufficient information without unnecessary backstory.
I think the new text conveys the necessary information to the intended audience with more clarity without the history lesson or the record of your past frustration. Am I mistaken?
Re: [PATCH] gitweb/INSTALL: Simplify description of GITWEB_CONFIG_SYSTEM
Quoted 10 lines · Junio C Hamano
In order to just pick and use the more appropriate one (or a useful combination of the two), a clean description of what each of them do without historical cruft is more readable and useful, isn't it? I would expect that most of them who are newly configuring a system would pick COMMON one and override per instance as needed, without touching the SYSTEM one (fallback default) after reading the above, and that is what we want to happen.
Do you think sysadmins need a history lesson to understand why there are two different possibilities?
[...]
Quoted 3 lines
I think the new text conveys the necessary information to the intended audience with more clarity without the history lesson or the record of your past frustration. Am I mistaken?
Note also that this is about *gitweb/INSTALL*, which is meant to be *short* and succint description on how to install gitweb, and not about the reference documentation: gitweb(1) or gitweb.conf(5).
Description of historical behavior (and backward compatibility) has place (if any) in manpages, not gitweb/INSTALL.
Signature · 1 line
Jakub Narębski
Re: [PATCH] gitweb/INSTALL: Simplify description of GITWEB_CONFIG_SYSTEM
Quoted 17 lines · Jakub Narębski
Quoted 10 lines · Junio C Hamano
In order to just pick and use the more appropriate one (or a useful combination of the two), a clean description of what each of them do without historical cruft is more readable and useful, isn't it? I would expect that most of them who are newly configuring a system would pick COMMON one and override per instance as needed, without touching the SYSTEM one (fallback default) after reading the above, and that is what we want to happen.
Do you think sysadmins need a history lesson to understand why there are two different possibilities?
[...]
Quoted 3 lines
I think the new text conveys the necessary information to the intended audience with more clarity without the history lesson or the record of your past frustration. Am I mistaken?
Quoted 8 lines
Note also that this is about *gitweb/INSTALL*, which is meant to be *short* and succint description on how to install gitweb, and not about the reference documentation: gitweb(1) or
gitweb.conf(5).Description of historical behavior (and backward compatibility) has place (if any) in manpages, not gitweb/INSTALL. --
Jakub Narębski
Let us then agree that it should be mentioned somewhere in gitweb.conf.txt then (as it currently is not).
--
-Drew Northup
--------------------------------------------------------------
"As opposed to vegetable or mineral error?"
-John Pescatore, SANS NewsBites Vol. 12 Num. 59
Re: [PATCH] gitweb/INSTALL: Simplify description of GITWEB_CONFIG_SYSTEM
In reply to Junio C HamanoQuoted 10 lines · Junio C Hamano
Quoted 8 lines · Drew Northup
Quoted 7 lines
gitweb/INSTALL +5
-0+ Note that the GITWEB_CONFIG_SYSTEM system-wide configuration file is + only used for instances that lack per-instance configuration file. + You can use GITWEB_CONFIG_COMMON common system-wide configuration + file (normally /etc/gitweb-common.conf) to keep common default + settings that apply to all instances. Settings from per-instance or system-wide configuration file override those from common system-wide configuration file.
Quoted 7 lines
Quoted 3 lines
That's the point of explaining SPECIFICALLY why the then current behavior wasn't being replaced, and this other mechanism (which would otherwise have no obvious reason for existing) was being introduced.
In order to just pick and use the more appropriate one (or a useful combination of the two), a clean description of what each of them do without historical cruft is more readable and useful, isn't it?
I am not demanding the retention of cruft, and the rewording is definitely more pleasant to read.
Quoted 8 lines
I
would expect that most of them who are newly configuring a system would pick COMMON one and override per instance as needed, without touching the SYSTEM one (fallback default) after reading the above, and that is what we want to happen.Do you think sysadmins need a history lesson to understand why there are two different possibilities?
We don't need a full history lesson. What we do need to know is that "Hey, they don't do that the way everybody else does because it would break things." That's enough to get the point across, and as Jakub noted gitweb.conf.txt is the correct place for it.
Quoted 11 lines
For example, bash reads some but not all possible configuration files. I would expect .bashrc to be read even for login shells after reading .bash_login; alas, that is not what happens. The manual does not apologize that the authors now know better and understand that it is a stupid behaviour. The order the rc files are read is just described matter-of-factly, and it gives sufficient information without unnecessary backstory.
I think the new text conveys the necessary information to the intended audience with more clarity without the history lesson or the record of your past frustration. Am I mistaken?
The back-story isn't needed; the "Hey this is different" part is. I think Jakub's suggestion of covering that (succinctly) in gitweb.conf.txt is the correct solution.
--
-Drew Northup
--------------------------------------------------------------
"As opposed to vegetable or mineral error?"
-John Pescatore, SANS NewsBites Vol. 12 Num. 59
PATCH 1/1 gitweb/INSTALL: GITWEB_CONFIG_SYSTEM is for backward compatibility
Signed-off-by Jakub Narebski <[email protected]>
---
This can be either squashed with previous patch to gitweb/INSTALL, kept as separate patch or discarded.
Drew: gitweb(1) or gitweb.conf(5) solution is more involved, so perhaps something like that?
gitweb/INSTALL | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
gitweb/INSTALL +2 -1
@@ -243,7 +243,6 @@ for gitweb (in gitweb/README), and gitweb.conf(5) manpage. GITWEB_CONFIG_SYSTEM build configuration variable, and override it through the GITWEB_CONFIG_SYSTEM environment variable. - Note that the GITWEB_CONFIG_SYSTEM system-wide configuration file is only used for instances that lack per-instance configuration file. You can use GITWEB_CONFIG_COMMON common system-wide configuration
@@ -252,6 +251,8 @@ for gitweb (in gitweb/README), and gitweb.conf(5) manpage. system-wide configuration file override those from common system-wide configuration file. + (Idiosyncratic GITWEB_CONFIG_SYSTEM is present for backward compatibility.) + - The gitweb config file is a fragment of perl code. You can set variables using "our $variable = value"; text from "#" character until the end of a line is ignored. See perlsyn(1) for details.
Signature · 1 line
1.7.10.4
Re: [PATCH] gitweb/INSTALL: GITWEB_CONFIG_SYSTEM is for backward compatibility
Quoted 2 lines · Jakub Narębski
Drew: gitweb(1) or
gitweb.conf(5)solution is more involved, so perhaps something like that?
That or: (or both I suppose....hopefully not too mangled by Google's mail gadget)
-- >8 --
Subject: [PATCH] Documentation/gitweb.conf.txt: Move note about config order precedence
To go along with Jakub Narebski's cleanup of gitweb/INSTALL; making it clear that gitweb's config files work differently than a lot of other system-wide software. This is unobtrusive yet to the point.
--- Documentation/gitweb.conf.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
Documentation/gitweb.conf.txt +0 -0
@@ -55,7 +55,8 @@ following order: then fallback system-wide configuration file (defaults to
'/etc/gitweb.conf').
Values obtained in later configuration files override values obtained earlier
-in the above sequence.
+in the above sequence. This is different from many system-wide software +installations and will stay this way for historical reasons.
Locations of the common system-wide configuration file, the fallback system-wide configuration file and the per-instance configuration file
--
1.8.0
--
-Drew Northup
--------------------------------------------------------------
"As opposed to vegetable or mineral error?"
-John Pescatore, SANS NewsBites Vol. 12 Num. 59
Re: [PATCH] gitweb/INSTALL: GITWEB_CONFIG_SYSTEM is for backward compatibility
Forgot the S-O-B...
Quoted 9 lines · Drew Northup
Quoted 2 lines · Jakub Narębski
Drew: gitweb(1) or
gitweb.conf(5)solution is more involved, so perhaps something like that?That or: (or both I suppose....hopefully not too mangled by Google's mail gadget)
Subject: [PATCH] [PATCH] Documentation/gitweb.conf.txt: Move note about config order precedence
To go along with Jakub Narebski's cleanup of gitweb/INSTALL; making it clear that gitweb's config files work differently than a lot of other system-wide software. This is unobtrusive yet to the point.
Signed-off-by Drew Northup <[email protected]>
--- Documentation/gitweb.conf.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
Documentation/gitweb.conf.txt +0 -0
@@ -55,7 +55,8 @@ following order: then fallback system-wide configuration file (defaults to
'/etc/gitweb.conf').
Values obtained in later configuration files override values obtained earlier
-in the above sequence.
+in the above sequence. This is different from many system-wide software +installations and will stay this way for historical reasons.
Locations of the common system-wide configuration file, the fallback system-wide configuration file and the per-instance configuration file
--
1.8.0
--
-Drew Northup
--------------------------------------------------------------
"As opposed to vegetable or mineral error?"
-John Pescatore, SANS NewsBites Vol. 12 Num. 59
Re: [PATCH] gitweb/INSTALL: GITWEB_CONFIG_SYSTEM is for backward compatibility
In reply to Drew NorthupQuoted 1 line · Drew Northup
This is unobtrusive yet to the point.
I agree with the spirit.
[...]
Documentation/gitweb.conf.txt
Quoted 10 lines
Documentation/gitweb.conf.txt +0
-0@@ -55,7 +55,8 @@ following order: then fallback system-wide configuration file (defaults to'
/etc/gitweb.conf').Values obtained in later configuration files override values obtained earlier
Documentation/gitweb.conf.txt +2
-1-in the above sequence. +in the above sequence. This is different from many system-wide software +installations and will stay this way for historical reasons.
That makes it sound like the "per instance overrides common overrides built-in" cascading is what is unusual and what we need to apologize for.
How about something like the following? (It uses a BUGS section to make the warning easy to notice for people tracking down confusing behavior by searching for "gitweb.conf".)
Documentation/gitweb.conf.txt +7 -0
@@ -857,6 +857,13 @@ adding the following lines to your gitweb configuration file: $known_snapshot_formats{'zip'}{'disabled'} = 1; $known_snapshot_formats{'tgz'}{'compressor'} = ['gzip','-6']; +BUGS +---- +Debugging would be easier if the fallback configuration file +(`/etc/gitweb.conf`) and environment variable to override its location +('GITWEB_CONFIG_SYSTEM') had names reflecting their "fallback" role. +The current names are kept to avoid breaking working setups. + ENVIRONMENT ----------- The location of per-instance and system-wide configuration files can be
Re: [PATCH] gitweb/INSTALL: GITWEB_CONFIG_SYSTEM is for backward compatibility
Quoted 13 lines · Jonathan Nieder
Quoted 1 line · Drew Northup
This is unobtrusive yet to the point.
I agree with the spirit.
[...]
Quoted 6 lines
Documentation/gitweb.conf.txt +0
-0@@ -55,7 +55,8 @@ following order: then fallback system-wide configuration file (defaults to'
/etc/gitweb.conf').
Quoted 8 lines
Documentation/gitweb.conf.txt
Quoted 4 lines
Values obtained in later configuration files override values obtained earlier
Documentation/gitweb.conf.txt +2
-1-in the above sequence. +in the above sequence. This is different from many system-wide software +installations and will stay this way for historical reasons.That makes it sound like the "per instance overrides common overrides built-in" cascading is what is unusual and what we need to apologize for.
I don't think were apologizing for anything. It is helpful to say "we do some things differently here and don't plan on changing for a very important reason.
Quoted 12 lines
How about something like the following? (It uses a BUGS section to make the warning easy to notice for people tracking down confusing behavior by searching for "gitweb.conf".)
Documentation/gitweb.conf.txt +0
-0@@ -857,6 +857,13 @@ adding the following lines to your gitweb configuration file: $known_snapshot_formats{'zip'}{'disabled'} = 1; $known_snapshot_formats{'tgz'}{'compressor'} = ['gzip','-6'];
Documentation/gitweb.conf.txt adding the following lines to your gitweb configuration file: · line 869
Quoted 10 lines
Documentation/gitweb.conf.txt +7
-0+BUGS +---- +Debugging would be easier if the fallback configuration file +(`/etc/gitweb.conf`) and environment variable to override its location +('GITWEB_CONFIG_SYSTEM') had names reflecting their "fallback" role. +The current names are kept to avoid breaking working setups. + ENVIRONMENT ----------- The location of per-instance and system-wide configuration files can be
I don't disagree with this, as some would consider the naming to be a bug, but after having been given a good schooling on the git list a while back as to why it is the way it is I'm hesitant to label "has history" as a bug.
--
-Drew Northup
--------------------------------------------------------------
"As opposed to vegetable or mineral error?"
-John Pescatore, SANS NewsBites Vol. 12 Num. 59
Re: [PATCH] gitweb/INSTALL: GITWEB_CONFIG_SYSTEM is for backward compatibility
Quoted 7 lines · Drew Northup
Quoted 3 lines
That makes it sound like the "per instance overrides common overrides built-in" cascading is what is unusual and what we need to apologize for.
I don't think were apologizing for anything. It is helpful to say "we do some things differently here and don't plan on changing for a very important reason.
My biggest resistance against this whole thing is that word "differently".
It really depends on who reads this document. For some, it may be different. For others, it may not be unexpected at all. "We do things differently" may help the former but I do not want the latter to try to find "difference" that does not exist elsewhere and get confused.
Quoted 16 lines
Documentation/gitweb.conf.txt adding the following lines to your gitweb configuration file: · line 869
Quoted 11 lines
Documentation/gitweb.conf.txt +7
-0+BUGS +---- +Debugging would be easier if the fallback configuration file +(`/etc/gitweb.conf`) and environment variable to override its location +('GITWEB_CONFIG_SYSTEM') had names reflecting their "fallback" role. +The current names are kept to avoid breaking working setups. + ENVIRONMENT ----------- The location of per-instance and system-wide configuration files can beI don't disagree with this, as some would consider the naming to be a bug, but after having been given a good schooling on the git list a while back as to why it is the way it is I'm hesitant to label "has history" as a bug.
BUGS section being traditionally where you would throw this kind of thing, either a bug, non-bug, or wai-but-some-may-not-agree, I think this is a good description.
PATCH 2/10 git-remote-mediawiki: spelling fixes
In reply to Jonathan NiederFrom: Stefano Lattarini <[email protected]>
Date: Fri, 12 Apr 2013 00:36:10 +0200
Most of these were found using Lucas De Marchi's codespell tool. Others were pointed out by Eric Sunshine.
Helped-by Eric Sunshine <[email protected]>
Signed-off-by Stefano Lattarini <[email protected]>
Signed-off-by Jonathan Nieder <[email protected]>
--- contrib/mw-to-git/git-remote-mediawiki.perl | 6 +++--- contrib/mw-to-git/t/README | 6 +++--- contrib/mw-to-git/t/install-wiki/LocalSettings.php | 2 +- contrib/mw-to-git/t/t9362-mw-to-git-utf8.sh | 14 +++++++------- 4 files changed, 14 insertions(+), 14 deletions(-)
contrib/mw-to-git/git-remote-mediawiki.perl +3 -3
@@ -28,7 +28,7 @@ use constant SLASH_REPLACEMENT => "%2F"; # It's not always possible to delete pages (may require some -# priviledges). Deleted pages are replaced with this content. +# privileges). Deleted pages are replaced with this content. use constant DELETED_CONTENT => "[[Category:Deleted]]\n"; # It's not possible to create empty pages. New empty files in Git are
@@ -841,7 +841,7 @@ sub mw_import_ref { if ($fetch_from == 1 && $n == 0) { print STDERR "You appear to have cloned an empty MediaWiki.\n"; # Something has to be done remote-helper side. If nothing is done, an error is - # thrown saying that HEAD is refering to unknown object 0000000000000000000 + # thrown saying that HEAD is referring to unknown object 0000000000000000000 # and the clone fails. } }
@@ -1067,7 +1067,7 @@ sub mw_push_file { my $file_content; if ($page_deleted) { # Deleting a page usually requires - # special priviledges. A common + # special privileges. A common # convention is to replace the page # with this content instead: $file_content = DELETED_CONTENT;
contrib/mw-to-git/t/README +3 -3
@@ -25,7 +25,7 @@ Principles and Technical Choices The test environment makes it easy to install and manipulate one or several MediaWiki instances. To allow developers to run the testsuite -easily, the environment does not require root priviledge (except to +easily, the environment does not require root privilege (except to install the required packages if needed). It starts a webserver instance on the user's account (using lighttpd greatly helps for that), and does not need a separate database daemon (thanks to the use
@@ -81,7 +81,7 @@ parameters, please refer to the `test-gitmw-lib.sh` and ** `test_check_wiki_precond`: Check if the tests must be skipped or not. Please use this function -at the beggining of each new test file. +at the beginning of each new test file. ** `wiki_getpage`: Fetch a given page from the wiki and puts its content in the
@@ -113,7 +113,7 @@ Tests if a given page exists on the wiki. ** `wiki_reset`: Reset the wiki, i.e. flush the database. Use this function at the -begining of each new test, except if the test re-uses the same wiki +beginning of each new test, except if the test re-uses the same wiki (and history) as the previous test. How to write a new test
contrib/mw-to-git/t/install-wiki/LocalSettings.php +1 -1
@@ -88,7 +88,7 @@ $wgShellLocale = "en_US.utf8"; ## Set $wgCacheDirectory to a writable directory on the web server ## to make your wiki go slightly faster. The directory should not -## be publically accessible from the web. +## be publicly accessible from the web. #$wgCacheDirectory = "$IP/cache"; # Site language code, should be one of the list in ./languages/Names.php
contrib/mw-to-git/t/t9362-mw-to-git-utf8.sh +7 -7
@@ -139,7 +139,7 @@ test_expect_success 'character $ in file name (git -> mw) ' ' ' -test_expect_failure 'capital at the begining of file names' ' +test_expect_failure 'capital at the beginning of file names' ' wiki_reset && git clone mediawiki::'"$WIKI_URL"' mw_dir_10 && (
@@ -156,7 +156,7 @@ test_expect_failure 'capital at the begining of file names' ' ' -test_expect_failure 'special character at the begining of file name from mw to git' ' +test_expect_failure 'special character at the beginning of file name from mw to git' ' wiki_reset && git clone mediawiki::'"$WIKI_URL"' mw_dir_11 && wiki_editpage {char_1 "expect to be renamed {char_1" false &&
@@ -189,7 +189,7 @@ test_expect_success 'Push page with title containing ":" other than namespace se wiki_page_exist NotANameSpace:Page ' -test_expect_success 'test of correct formating for file name from mw to git' ' +test_expect_success 'test of correct formatting for file name from mw to git' ' wiki_reset && git clone mediawiki::'"$WIKI_URL"' mw_dir_12 && wiki_editpage char_%_7b_1 "expect to be renamed char{_1" false &&
@@ -207,7 +207,7 @@ test_expect_success 'test of correct formating for file name from mw to git' ' ' -test_expect_failure 'test of correct formating for file name begining with special character' ' +test_expect_failure 'test of correct formatting for file name beginning with special character' ' wiki_reset && git clone mediawiki::'"$WIKI_URL"' mw_dir_13 && (
@@ -215,7 +215,7 @@ test_expect_failure 'test of correct formating for file name begining with speci echo "my new file {char_1" >\{char_1.mw && echo "my new file [char_2" >\[char_2.mw && git add . && - git commit -am "commiting some exotic file name..." && + git commit -am "committing some exotic file name..." && git push && git pull ) &&
@@ -226,7 +226,7 @@ test_expect_failure 'test of correct formating for file name begining with speci ' -test_expect_success 'test of correct formating for file name from git to mw' ' +test_expect_success 'test of correct formatting for file name from git to mw' ' wiki_reset && git clone mediawiki::'"$WIKI_URL"' mw_dir_14 && (
@@ -234,7 +234,7 @@ test_expect_success 'test of correct formating for file name from git to mw' ' echo "my new file char{_1" >Char\{_1.mw && echo "my new file char[_2" >Char\[_2.mw && git add . && - git commit -m "commiting some exotic file name..." && + git commit -m "committing some exotic file name..." && git push ) && wiki_getallpage ref_page_14 &&
Signature · 1 line
1.8.2.1
Re: [PATCH 02/10] git-remote-mediawiki: spelling fixes
Quoted 9 lines · Jonathan Nieder
From: Stefano Lattarini <[email protected]>
Date: Fri, 12 Apr 2013 00:36:10 +0200Most of these were found using Lucas De Marchi's codespell tool. Others were pointed out by Eric Sunshine.
Helped-by Eric Sunshine <[email protected]>Signed-off-by Stefano Lattarini <[email protected]>Signed-off-by Jonathan Nieder <[email protected]>
And obviously Ack-ed-by: Matthieu Moy <[email protected]>
Thanks,
Signature · 2 lines
Matthieu Moy http://www-verimag.imag.fr/~moy/
PATCH 3/10 contrib/subtree: fix spelling of accidentally
In reply to Jonathan NiederFrom: Stefano Lattarini <[email protected]>
Date: Fri, 12 Apr 2013 00:36:10 +0200
Noticed with Lucas De Marchi's codespell tool.
Signed-off-by Stefano Lattarini <[email protected]>
Signed-off-by Jonathan Nieder <[email protected]>
--- contrib/subtree/t/t7900-subtree.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
contrib/subtree/t/t7900-subtree.sh +1 -1
@@ -419,7 +419,7 @@ test_expect_success 'add main-sub5' ' test_expect_success 'split for main-sub5 without --onto' ' # also test that we still can split out an entirely new subtree # if the parent of the first commit in the tree is not empty, - # then the new subtree has accidently been attached to something + # then the new subtree has accidentally been attached to something git subtree split --prefix subdir2 --branch mainsub5 && check_equal ''"$(git log --pretty=format:%P -1 mainsub5)"'' "" '
Signature · 1 line
1.8.2.1
PATCH 4/10 obstack: fix spelling of similar
In reply to Jonathan NiederFrom: Stefano Lattarini <[email protected]>
Date: Fri, 12 Apr 2013 00:36:10 +0200
Noticed using Lucas De Marchi's codespell tool.
Signed-off-by Stefano Lattarini <[email protected]>
Signed-off-by Jonathan Nieder <[email protected]>
---
Would it be more useful to fix this in glibc and import from there?
compat/obstack.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
compat/obstack.h +1 -1
@@ -128,7 +128,7 @@ extern "C" {#define __BPTR_ALIGN (B ,P ,A ) ((B) + (((P) - (B) + (A)) & ~(A))) -/* Similiar to _BPTR_ALIGN (B, P, A), except optimize the common case +/* Similar to _BPTR_ALIGN (B, P, A), except optimize the common case where pointers can be converted to integers, aligned as integers, and converted back again. If PTR_INT_TYPE is narrower than a pointer (e.g., the AS/400), play it safe and compute the alignment
Signature · 1 line
1.8.2.1
PATCH 5/10 compat/regex: fix spelling and grammar in comments
In reply to Jonathan NiederFrom: Stefano Lattarini <[email protected]>
Date: Fri, 12 Apr 2013 00:36:10 +0200
Some of these were found using Lucas De Marchi's codespell tool. Others noticed by Eric Sunshine.
Helped-by Eric Sunshine <[email protected]>
Signed-off-by Stefano Lattarini <[email protected]>
Signed-off-by Jonathan Nieder <[email protected]>
---
Is gawk the appropriate upstream to send this sort of readability improvement to?
compat/regex/regcomp.c | 4 ++-- compat/regex/regex.c | 2 +- compat/regex/regex_internal.c | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-)
compat/regex/regcomp.c +2 -2
@@ -2095,7 +2095,7 @@ peek_token_bracket (re_token_t *token, re_string_t *input, reg_syntax_t syntax)/* Entry point of the parser. Parse the regular expression REGEXP and return the structure tree. -If an error is occured, ERR is set by error code, and return NULL. +If an error has occurred, ERR is set by error code, and return NULL. This function build the following tree, from regular expression <reg_exp>: CAT / \
@@ -3715,7 +3715,7 @@ build_charclass_op (re_dfa_t *dfa, RE_TRANSLATE_TYPE trans,/* This is intended for the expressions like "a{1,3}". Fetch a number from `input', and return the number. Return -1, if the number field is empty like "{,1}". -Return -2, If an error is occured. */ +Return -2, if an error has occurred. */ static int fetch_number (re_string_t *input,re_token_t *token,reg_syntax_t syntax)
compat/regex/regex.c +1 -1
@@ -22,7 +22,7 @@#include "config.h" #endif -/* Make sure noone compiles this code with a C++ compiler. */ +/* Make sure no one compiles this code with a C++ compiler. */ #ifdef __cplusplus# error "This is C code, use a C compiler"#endif
compat/regex/regex_internal.c +3 -3
@@ -1284,7 +1284,7 @@ re_node_set_merge (re_node_set *dest, const re_node_set *src)/* Insert the new element ELEM to the re_node_set* SET. SET should not already have ELEM. -return -1 if an error is occured, return 1 otherwise. */ +return -1 if an error has occurred, return 1 otherwise. */ static int internal_function
@@ -1341,7 +1341,7 @@ re_node_set_insert (re_node_set *set, int elem)/* Insert the new element ELEM to the re_node_set* SET. SET should not already have any element greater than or equal to ELEM. -Return -1 if an error is occured, return 1 otherwise. */ +Return -1 if an error has occurred, return 1 otherwise. */ static int internal_function
@@ -1416,7 +1416,7 @@ re_node_set_remove_at (re_node_set *set, int idx)/* Add the token TOKEN to dfa->nodes, and return the index of the token. -Or return -1, if an error will be occured. */ +Or return -1, if an error has occurred. */ static int internal_function
Signature · 1 line
1.8.2.1
PATCH 6/10 compat/nedmalloc: fix spelling in comments
In reply to Jonathan NiederFrom: Stefano Lattarini <[email protected]>
Date: Fri, 12 Apr 2013 00:36:10 +0200
Correct some typos found using Lucas De Marchi's codespell tool.
Signed-off-by Stefano Lattarini <[email protected]>
Signed-off-by Jonathan Nieder <[email protected]>
---
These don't seem to be fixed yet in https://github.com/ned14/nedmalloc
(pointed to from http://www.nedprod.com/programs/portable/nedmalloc/).
Would it make sense to write a note to Ned and then import a fixed version from there?
compat/nedmalloc/malloc.c.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
compat/nedmalloc/malloc.c.h +3 -3
@@ -4778,7 +4778,7 @@ void* dlmalloc(size_t bytes) {void dlfree (void * mem) {/* -Consolidate freed chunks with preceeding or succeeding bordering +Consolidate freed chunks with preceding or succeeding bordering free chunks, if they exist, and then place in a bin. Intermixed with special cases for top, dv, mmapped chunks, and usage errors. */
@@ -5680,10 +5680,10 @@ History: Wolfram Gloger ([email protected]). * Use last_remainder in more cases. * Pack bins using idea from [email protected] - * Use ordered bins instead of best-fit threshhold + * Use ordered bins instead of best-fit threshold * Eliminate block-local decls to simplify tracing and debugging. * Support another case of realloc via move into top - * Fix error occuring when initial sbrk_base not word-aligned. + * Fix error occurring when initial sbrk_base not word-aligned. * Rely on page size for units instead of SBRK_UNIT to avoid surprises about sbrk alignment conventions. * Add mallinfo, mallopt. Thanks to Raymond Nijssen
Signature · 1 line
1.8.2.1
Re: [PATCH 06/10] compat/nedmalloc: fix spelling in comments
Quoted 4 lines · Jonathan Nieder
These don't seem to be fixed yet in https://github.com/ned14/nedmalloc
(pointed to from http://www.nedprod.com/programs/portable/nedmalloc/).
Would it make sense to write a note to Ned and then import a fixed version from there?
Not necessarily. Last time I checked upstream nedmalloc has diverged quite a lot from our version (which is why I only cherry-picked a small change from upstream instead of taking all of it), so we should make sure not to import any unwanted stuff when going the route of importing upstream.
Signature · 1 line
Sebastian Schuberth
PATCH 7/10 precompose-utf8: fix spelling of "want" in error message
In reply to Jonathan NiederFrom: Stefano Lattarini <[email protected]>
Date: Fri, 12 Apr 2013 00:36:10 +0200
Noticed using Lucas De Marchi's codespell tool.
Signed-off-by Stefano Lattarini <[email protected]>
Signed-off-by Jonathan Nieder <[email protected]>
--- compat/precompose_utf8.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
compat/precompose_utf8.c +1 -1
@@ -134,7 +134,7 @@ struct dirent_prec_psx *precompose_utf8_readdir(PREC_DIR *prec_dir)if (prec_dir->ic_precompose == (iconv_t)-1 ) {die ("iconv_open(%s,%s) failed, but needed:\n" " precomposed unicode is not supported.\n" -" If you wnat to use decomposed unicode, run\n" +" If you want to use decomposed unicode, run\n" " \"git config core.precomposeunicode false\"\n" , repo_encoding, path_encoding); }else {
Signature · 1 line
1.8.2.1
PATCH 8/10 kwset: fix spelling in comments
In reply to Jonathan NiederFrom: Stefano Lattarini <[email protected]>
Date: Fri, 12 Apr 2013 00:36:10 +0200
Correct spelling mistakes noticed using Lucas De Marchi's codespell tool.
Signed-off-by Stefano Lattarini <[email protected]>
Signed-off-by Jonathan Nieder <[email protected]>
---
Git might be the canonical upstream for the GPL-2+ version of this code.
kwset.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
kwset.c +2 -2
@@ -26,7 +26,7 @@The author may be reached (Email) at the address [email protected], or (US mail) as Mike Haertel c/o Free Software Foundation. */ -/* The algorithm implemented by these routines bears a startling resemblence +/* The algorithm implemented by these routines bears a startling resemblance to one discovered by Beate Commentz-Walter, although it is not identical. See "A String Matching Algorithm Fast on the Average," Technical Report, IBM-Germany, Scientific Center Heidelberg, Tiergartenstrasse 15, D-6900
@@ -435,7 +435,7 @@ kwsprep (kwset_t kws)/* Update the delta table for the descendents of this node. */ treedelta (curr->links, curr->depth, delta); -/* Compute the failure function for the decendents of this node. */ +/* Compute the failure function for the descendants of this node. */ treefails (curr->links, curr->fail, kwset->trie);/* Update the shifts at each node in the current node's chain
Signature · 1 line
1.8.2.1
PATCH 9/10 git-gui: fix spelling in comments
In reply to Jonathan NiederFrom: Stefano Lattarini <[email protected]>
Date: Fri, 12 Apr 2013 00:36:10 +0200
Correct common spelling mistakes noticed by Lucas De Marchi's codespell tool.
Signed-off-by Stefano Lattarini <[email protected]>
Signed-off-by Jonathan Nieder <[email protected]>
---
Split from a larger patch. Could be applied with "patch -p2" if it seems like a good change for git-gui.
git-gui/lib/blame.tcl | 2 +- git-gui/lib/index.tcl | 2 +- git-gui/lib/spellcheck.tcl | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-)
git-gui/lib/blame.tcl +1 -1
@@ -5,7 +5,7 @@ class blame { image create photo ::blame::img_back_arrow -data {R0lGODlhGAAYAIUAAPwCBEzKXFTSZIz+nGzmhGzqfGTidIT+nEzGXHTqhGzmfGzifFzadETCVES+VARWDFzWbHzyjAReDGTadFTOZDSyRDyyTCymPARaFGTedFzSbDy2TCyqRCyqPARaDAyCHES6VDy6VCyiPAR6HCSeNByWLARyFARiDARqFGTifARiFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAYABgAAAajQIBwSCwaj8ikcsk0BppJwRPqHEypQwHBis0WDAdEFyBIKBaMAKLBdjQeSkFBYTBAIvgEoS6JmhUTEwIUDQ4VFhcMGEhyCgoZExoUaxsWHB0THkgfAXUGAhoBDSAVFR0XBnCbDRmgog0hpSIiDJpJIyEQhBUcJCIlwA22SSYVogknEg8eD82qSigdDSknY0IqJQXPYxIl1dZCGNvWw+Dm510GQQAh/mhDcmVhdGVkIGJ5IEJNUFRvR0lGIFBybyB2ZXJzaW9uIDIuNQ0KqSBEZXZlbENvciAxOTk3LDE5OTguIEFsbCByaWdodHMgcmVzZXJ2ZWQuDQpodHRwOi8vd3d3LmRldmVsY29yLmNvbQA7} -# Persistant data (survives loads) +# Persistent data (survives loads) # field history {}; # viewer history: {commit path} field header ; # array commit,key -> header field
git-gui/lib/index.tcl +1 -1
@@ -414,7 +414,7 @@ proc revert_helper {txt paths} { # such distinction is needed in some languages. Previously, the # code used "Revert changes in" for both, but that can't work # in languages where 'in' must be combined with word from - # rest of string (in diffrent way for both cases of course). + # rest of string (in different way for both cases of course). # # FIXME: Unfortunately, even that isn't enough in some languages # as they have quite complex plural-form rules. Unfortunately,
git-gui/lib/spellcheck.tcl +2 -2
@@ -14,7 +14,7 @@ field w_menu ; # context menu for the widget field s_menuidx 0 ; # last index of insertion into $w_menu field s_i {} ; # timer registration for _run callbacks -field s_clear 0 ; # did we erase mispelled tags yet? +field s_clear 0 ; # did we erase misspelled tags yet? field s_seen [list] ; # lines last seen from $w_text in _run field s_checked [list] ; # lines already checked field s_pending [list] ; # [$line $data] sent to ispell/aspell
@@ -259,7 +259,7 @@ method _run {} { if {$n == $cur_line && ![regexp {^\W$} [$w_text get $cur_pos insert]]} { - # If the current word is mispelled remove the tag + # If the current word is misspelled remove the tag # but force a spellcheck later. # set tags [$w_text tag names $cur_pos]
Signature · 1 line
1.8.2.1
PATCH 10/10 Correct common spelling mistakes in comments and tests
In reply to Jonathan NiederFrom: Stefano Lattarini <[email protected]>
Date: Fri, 12 Apr 2013 00:36:10 +0200
Most of these were found using Lucas De Marchi's codespell tool.
Signed-off-by Stefano Lattarini <[email protected]>
Signed-off-by Jonathan Nieder <[email protected]>
---
Thanks for reading.
builtin/apply.c | 6 +++--- commit.c | 2 +- commit.h | 2 +- diff.c | 2 +- git-add--interactive.perl | 2 +- git-cvsserver.perl | 4 ++-- git-quiltimport.sh | 2 +- gitweb/gitweb.perl | 6 +++--- perl/Git.pm | 2 +- perl/Git/I18N.pm | 2 +- perl/private-Error.pm | 2 +- sequencer.c | 2 +- t/t1006-cat-file.sh | 2 +- t/t3701-add-interactive.sh | 2 +- t/t4014-format-patch.sh | 6 +++--- t/t4124-apply-ws-rule.sh | 2 +- t/t6030-bisect-porcelain.sh | 2 +- t/t7601-merge-pull-config.sh | 2 +- t/t7610-mergetool.sh | 2 +- t/t9001-send-email.sh | 4 ++-- transport-helper.c | 2 +- transport.h | 2 +- xdiff/xdiffi.c | 2 +- xdiff/xhistogram.c | 2 +- 24 files changed, 32 insertions(+), 32 deletions(-)
builtin/apply.c +3 -3
@@ -1921,7 +1921,7 @@ static int parse_binary(char *buffer, unsigned long size, struct patch *patch) }/* -* Read the patch text in "buffer" taht extends for "size" bytes; stop +* Read the patch text in "buffer" that extends for "size" bytes; stop * reading after seeing a single patch (i.e. changes to a single file). * Create fragments (i.e. patch hunks) and hang them to the given patch. * Return the number of bytes consumed, so that the caller can call us
@@ -3025,7 +3025,7 @@ static struct patch *in_fn_table(const char *name)* * The latter is needed to deal with a case where two paths A and B * are swapped by first renaming A to B and then renaming B to A; -* moving A to B should not be prevented due to presense of B as we +* moving A to B should not be prevented due to presence of B as we * will remove it in a later patch. */ #define PATH_TO_BE_DELETED ((struct patch *) -2)
@@ -3509,7 +3509,7 @@ static int check_patch(struct patch *patch)* * A patch to swap-rename between A and B would first rename A * to B and then rename B to A. While applying the first one, -* the presense of B should not stop A from getting renamed to +* the presence of B should not stop A from getting renamed to * B; ask to_be_deleted() about the later rename. Removal of * B and rename from A to B is handled the same way by asking * was_deleted().
commit.c +1 -1
@@ -834,7 +834,7 @@ struct commit_list *get_merge_bases(struct commit *one, struct commit *two, }/* -* Is "commit" a decendant of one of the elements on the "with_commit" list? +* Is "commit" a descendant of one of the elements on the "with_commit" list? */ int is_descendant_of (struct commit *commit,struct commit_list *with_commit) {
commit.h +1 -1
@@ -164,7 +164,7 @@ extern struct commit_list *get_merge_bases(struct commit *rev1, struct commit *rextern struct commit_list *get_merge_bases_many (struct commit *one,int n,struct commit **twos,int cleanup);extern struct commit_list *get_octopus_merge_bases (struct commit_list *in); -/* largest postive number a signed 32-bit integer can contain */ +/* largest positive number a signed 32-bit integer can contain */ #define INFINITE_DEPTH 0x7fffffffextern int register_shallow (const unsigned char *sha1);
diff.c +1 -1
@@ -1565,7 +1565,7 @@ static void show_stats(struct diffstat_t *data, struct diff_options *options)* Binary files are displayed with "Bin XXX -> YYY bytes" * instead of the change count and graph. This part is treated * similarly to the graph part, except that it is not -* "scaled". If total width is too small to accomodate the +* "scaled". If total width is too small to accommodate the * guaranteed minimum width of the filename part and the * separators and this message, this message will "overflow" * making the line longer than the maximum width.
git-add--interactive.perl +1 -1
@@ -1247,7 +1247,7 @@ sub summarize_hunk { # Print a one-line summary of each hunk in the array ref in -# the first argument, starting wih the index in the 2nd. +# the first argument, starting with the index in the 2nd. sub display_hunks { my ($hunks, $i) = @_; my $ctr = 0;
git-cvsserver.perl +2 -2
@@ -2911,7 +2911,7 @@ sub filenamesplit } # Cleanup various junk in filename (try to canonicalize it), and -# add prependdir to accomodate running CVS client from a +# add prependdir to accommodate running CVS client from a # subdirectory (so the output is relative to top directory of the project). sub filecleanup {
@@ -4583,7 +4583,7 @@ sub getmeta # the numerical value of the corresponding byte plus # 100. # - "plus 100" avoids "0"s, and also reduces the - # likelyhood of a collision in the case that someone someday + # likelihood of a collision in the case that someone someday # writes an import tool that tries to preserve original # CVS revision numbers, and the original CVS data had done # lots of branches off of branches and other strangeness to
git-quiltimport.sh +1 -1
@@ -59,7 +59,7 @@ tmp_patch="$tmp_dir/patch" tmp_info="$tmp_dir/info" -# Find the intial commit +# Find the initial commit commit=$(git rev-parse HEAD) mkdir $tmp_dir || exit 2
gitweb/gitweb.perl +3 -3
@@ -683,7 +683,7 @@ sub evaluate_gitweb_config { our $GITWEB_CONFIG_SYSTEM = $ENV{'GITWEB_CONFIG_SYSTEM'} || "++GITWEB_CONFIG_SYSTEM++"; our $GITWEB_CONFIG_COMMON = $ENV{'GITWEB_CONFIG_COMMON'} || "++GITWEB_CONFIG_COMMON++"; - # Protect agains duplications of file names, to not read config twice. + # Protect against duplications of file names, to not read config twice. # Only one of $GITWEB_CONFIG and $GITWEB_CONFIG_SYSTEM is used, so # there possibility of duplication of filename there doesn't matter. $GITWEB_CONFIG = "" if ($GITWEB_CONFIG eq $GITWEB_CONFIG_COMMON);
@@ -1136,7 +1136,7 @@ sub handle_errors_html { # to avoid infinite loop where error occurs in die_error, # change handler to default handler, disabling handle_errors_html - set_message("Error occured when inside die_error:\n$msg"); + set_message("Error occurred when inside die_error:\n$msg"); # you cannot jump out of die_error when called as error handler; # the subroutine set via CGI::Carp::set_message is called _after_
@@ -7485,7 +7485,7 @@ sub git_object { system(git_cmd(), "cat-file", '-e', $hash_base) == 0 or die_error(404, "Base object does not exist"); - # here errors should not hapen + # here errors should not happen open my $fd, "-|", git_cmd(), "ls-tree", $hash_base, "--", $file_name or die_error(500, "Open git-ls-tree failed"); my $line = <$fd>;
perl/Git.pm +1 -1
@@ -1026,7 +1026,7 @@ my (%TEMP_FILEMAP, %TEMP_FILES); =item temp_acquire ( NAME ) -Attempts to retreive the temporary file mapped to the string C<NAME>. If an +Attempts to retrieve the temporary file mapped to the string C<NAME>. If an associated temp file has not been created this session or was closed, it is created, cached, and set for autoflush and binmode.
perl/Git/I18N.pm +1 -1
@@ -68,7 +68,7 @@ Git::I18N - Perl interface to Git's Gettext localizations print __("Welcome to Git!\n"); - printf __("The following error occured: %s\n"), $error; + printf __("The following error occurred: %s\n"), $error; =head1 DESCRIPTION
perl/private-Error.pm +1 -1
@@ -769,7 +769,7 @@ is a numeric value. These values are what will be returned by the overload methods. If the text value ends with C<at file line 1> as $@ strings do, then -this infomation will be used to set the C<-file> and C<-line> arguments +this information will be used to set the C<-file> and C<-line> arguments of the error object. This class is used internally if an eval'd block die's with an error
sequencer.c +1 -1
@@ -133,7 +133,7 @@ static void print_advice(int show_hint, struct replay_opts *opts)if (msg) {fprintf (stderr,"%s\n" , msg);/* -* A conflict has occured but the porcelain +* A conflict has occurred but the porcelain * (typically rebase --interactive) wants to take care * of the commit itself so remove CHERRY_PICK_HEAD */
t/t1006-cat-file.sh +1 -1
@@ -116,7 +116,7 @@ tree_pretty_content="100644 blob $hello_sha1 hello" run_tests 'tree' $tree_sha1 $tree_size "" "$tree_pretty_content" -commit_message="Intial commit" +commit_message="Initial commit" commit_sha1=$(echo_without_newline "$commit_message" | git commit-tree $tree_sha1) commit_size=176 commit_content="tree $tree_sha1
t/t3701-add-interactive.sh +1 -1
@@ -319,7 +319,7 @@ test_expect_success PERL 'split hunk "add -p (edit)"' ' # times to get out. # # 2. Correct version applies the (not)edited version, and asks - # about the next hunk, against wich we say q and program + # about the next hunk, against which we say q and program # exits. for a in s e q n q q do
t/t4014-format-patch.sh +3 -3
@@ -742,21 +742,21 @@ test_expect_success 'format-patch --signature --cover-letter' ' test 2 = $(grep "my sig" output | wc -l) ' -test_expect_success 'format.signature="" supresses signatures' ' +test_expect_success 'format.signature="" suppresses signatures' ' git config format.signature "" && git format-patch --stdout -1 >output && check_patch output && ! grep "^-- \$" output ' -test_expect_success 'format-patch --no-signature supresses signatures' ' +test_expect_success 'format-patch --no-signature suppresses signatures' ' git config --unset-all format.signature && git format-patch --stdout --no-signature -1 >output && check_patch output && ! grep "^-- \$" output ' -test_expect_success 'format-patch --signature="" supresses signatures' ' +test_expect_success 'format-patch --signature="" suppresses signatures' ' git format-patch --stdout --signature="" -1 >output && check_patch output && ! grep "^-- \$" output
t/t4124-apply-ws-rule.sh +1 -1
@@ -47,7 +47,7 @@ test_fix () { # find touched lines $DIFF file target | sed -n -e "s/^> //p" >fixed - # the changed lines are all expeced to change + # the changed lines are all expected to change fixed_cnt=$(wc -l <fixed) case "$1" in '') expect_cnt=$fixed_cnt ;;
t/t6030-bisect-porcelain.sh +1 -1
@@ -190,7 +190,7 @@ test_expect_success 'bisect start: no ".git/BISECT_START" if checkout error' ' # $HASH1 is good, $HASH4 is bad, we skip $HASH3 # but $HASH2 is bad, # so we should find $HASH2 as the first bad commit -test_expect_success 'bisect skip: successfull result' ' +test_expect_success 'bisect skip: successful result' ' git bisect reset && git bisect start $HASH4 $HASH1 && git bisect skip &&
t/t7601-merge-pull-config.sh +1 -1
@@ -109,7 +109,7 @@ test_expect_success 'setup conflicted merge' ' ' # First do the merge with resolve and recursive then verify that -# recusive is choosen. +# recusive is chosen. test_expect_success 'merge picks up the best result' ' git config --unset-all pull.twohead &&
t/t7610-mergetool.sh +1 -1
@@ -237,7 +237,7 @@ test_expect_success 'mergetool takes partial path' ' git submodule update -N && test_must_fail git merge master && - #shouldnt need these lines + #should not need these lines #( yes "d" | git mergetool file11 >/dev/null 2>&1 ) && #( yes "d" | git mergetool file12 >/dev/null 2>&1 ) && #( yes "l" | git mergetool submod >/dev/null 2>&1 ) &&
t/t9001-send-email.sh +2 -2
@@ -101,7 +101,7 @@ test_expect_success $PREREQ \ test_expect_success $PREREQ 'Send patches with --envelope-sender' ' clean_fake_sendmail && - git send-email --envelope-sender="Patch Contributer <[email protected]>" --suppress-cc=sob --from="Example <[email protected]>" [email protected] --smtp-server="$(pwd)/fake.sendmail" $patches 2>errors + git send-email --envelope-sender="Patch Contributor <[email protected]>" --suppress-cc=sob --from="Example <[email protected]>" [email protected] --smtp-server="$(pwd)/fake.sendmail" $patches 2>errors ' test_expect_success $PREREQ 'setup expect' '
@@ -787,7 +787,7 @@ test_expect_success $PREREQ 'confirm detects EOF (auto causes failure)' ' test $ret = "0" ' -test_expect_success $PREREQ 'confirm doesnt loop forever' ' +test_expect_success $PREREQ 'confirm does not loop forever' ' CONFIRM=$(git config --get sendemail.confirm) && git config sendemail.confirm auto && GIT_SEND_EMAIL_NOTTY=1 &&
transport-helper.c +1 -1
@@ -991,7 +991,7 @@ struct unidirectional_transfer {int src_is_sock;/* Is destination socket? */ int dest_is_sock; -/* Transfer state (TRANSFERING/FLUSHING/FINISHED) */ +/* Transfer state (TRANSFERRING/FLUSHING/FINISHED) */ int state;/* Buffer. */ char buf[BUFFERSIZE ];
transport.h +1 -1
@@ -74,7 +74,7 @@ struct transport { const char *executable, int fd[2]);/** get_refs_list(), fetch(), and push_refs() can keep -* resources (such as a connection) reserved for futher +* resources (such as a connection) reserved for further * use. disconnect() releases these resources. **/ int (*disconnect)(struct transport *connection);
xdiff/xdiffi.c +1 -1
@@ -490,7 +490,7 @@ int xdl_change_compact(xdfile_t *xdf, xdfile_t *xdfo, long flags) {/* * Try to move back the possibly merged group of changes, to match -* the recorded postion in the other file. +* the recorded position in the other file. */ while (ixref < ix) { rchg[--ixs] =1 ;
xdiff/xhistogram.c +1 -1
@@ -55,7 +55,7 @@ struct histindex {struct record {unsigned int ptr, cnt;struct record *next; - } **records,/* an ocurrence */ + } **records,/* an occurrence */ **line_map;/* map of line to record chain */ chastore_t rcha;unsigned int *next_ptrs;
Signature · 1 line
1.8.2.1
Re: [PATCH 10/10] Correct common spelling mistakes in comments and tests
t/t1006-cat-file.sh tree_pretty_content="100644 blob $hello_sha1 hello" · line 122
Quoted 13 lines · Jonathan Nieder
t/t1006-cat-file.sh +1
-1@@ -116,7 +116,7 @@ tree_pretty_content="100644 blob $hello_sha1 hello" run_tests 'tree' $tree_sha1 $tree_size "" "$tree_pretty_content" -commit_message="Intial commit" +commit_message="Initial commit" commit_sha1=$(echo_without_newline "$commit_message" | git commit-tree $tree_sha1) commit_size=176 commit_content="tree $tree_sha1
This breaks the test for rather obvious reasons. I'll squash this in:
t/t1006-cat-file.sh +1 -1
@@ -118,7 +118,7 @@ run_tests 'tree' $tree_sha1 $tree_size "" "$tree_pretty_content" commit_message="Initial commit" commit_sha1=$(echo_without_newline "$commit_message" | git commit-tree $tree_sha1) -commit_size=176 +commit_size=177 commit_content="tree $tree_sha1 author $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL> 0000000000 +0000 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 0000000000 +0000
Thanks.
Re: [RFC/PATCH maint 0/10] Re: [PATCH v2] Fix various typos and grammaros
In reply to Jonathan NiederQuoted 4 lines · Jonathan Nieder
Hi,
Junio C Hamano wrote:
Quoted 8 lines
Quoted 3 lines
How much of this stuff have interact with real changes that are in flight, with various doneness cooking in different integration branches?
All except the
t3511-cherry-pick-x.shchange apply cleanly to "maint" and merge without trouble with master and pu.Here is a split-up version.
Thanks.
Quoted 4 lines
I haven't looked closely at the patch,
even to sanity check it --- one of the main points of splitting it this way is to make it easier to review with reference to code borrowed from other projects.
Sure.
Quoted 3 lines
Some of these patches need more work if they are to be applied. For example, git-gui is maintained separately and should not be patched from the toplevel.
True.
Thanks.
Re: [PATCH v2] Fix various typos and grammaros
In reply to Junio C HamanoHi Junio.
Quoted 6 lines · Junio C Hamano
Stefano Lattarini <[email protected]> writes:
How much of this stuff have interact with real changes that are in flight, with various doneness cooking in different integration branches?
I don't know, since I only follow the master branch of Git. And honestly, I don't have time right now to go checking for possible
conflicts, or to resubmit ... But I see Jonathan has taken up
the ball on this (thanks Jonathan!), so I'll leave the matter to him.
Next time I'll try to prepare a patch broken up in more digestible pieces, so that it will be easier for you to deal with conflicts, and/or to selectively decide which fixes are worth applying.
Thanks, and sorry for the confusion,
Stefano
Re: [PATCH v2] Fix various typos and grammaros
Quoted 9 lines · Stefano Lattarini
Hi Junio.
Quoted 6 lines · Junio C Hamano
Stefano Lattarini <[email protected]> writes:
How much of this stuff have interact with real changes that are in flight, with various doneness cooking in different integration branches?
Quoted 5 lines
I don't know, since I only follow the master branch of Git. And honestly, I don't have time right now to go checking for possible
conflicts, or to resubmit ... But I see Jonathan has taken up
the ball on this (thanks Jonathan!), so I'll leave the matter to him.
Yeah, that's OK. Thanks.
Quoted 6 lines
Next time I'll try to prepare a patch broken up in more digestible pieces, so that it will be easier for you to deal with conflicts, and/or to selectively decide which fixes are worth applying.
Thanks, and sorry for the confusion,
Stefano