Sync with 'maint'
* maint: Correct common spelling mistakes in comments and tests kwset: fix spelling in comments precompose-utf8: fix spelling of "want" in error message compat/nedmalloc: fix spelling in comments compat/regex: fix spelling and grammar in comments obstack: fix spelling of similar contrib/subtree: fix spelling of accidentally git-remote-mediawiki: spelling fixes doc: various spelling fixes fast-export: fix argument name in error messages Documentation: distinguish between ref and offset deltas in pack-format i18n: make the translation of -u advice in one go
This commit is contained in:
Junio C Hamano
commit
caa7d79f1f
@ -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
|
||||
|
||||
@ -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"::
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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.
|
||||
|
||||
|
||||
@ -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\}'::
|
||||
|
||||
@ -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`::
|
||||
|
||||
@ -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.
|
||||
*/
|
||||
|
||||
@ -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.
|
||||
|
||||
@ -26,7 +26,9 @@ Git pack format
|
||||
|
||||
(deltified representation)
|
||||
n-byte type and length (3-bit type, (n-1)*7+4-bit length)
|
||||
20-byte base object name
|
||||
20-byte base object name if OBJ_REF_DELTA or a negative relative
|
||||
offset from the delta object's position in the pack if this
|
||||
is an OBJ_OFS_DELTA object
|
||||
compressed delta data
|
||||
|
||||
Observation: length of each object is encoded in a variable
|
||||
|
||||
@ -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().
|
||||
|
||||
@ -43,7 +43,7 @@ static int parse_opt_signed_tag_mode(const struct option *opt,
|
||||
else if (!strcmp(arg, "strip"))
|
||||
signed_tag_mode = STRIP;
|
||||
else
|
||||
return error("Unknown signed-tag mode: %s", arg);
|
||||
return error("Unknown signed-tags mode: %s", arg);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -420,7 +420,7 @@ static void handle_tag(const char *name, struct tag *tag)
|
||||
switch(signed_tag_mode) {
|
||||
case ABORT:
|
||||
die ("Encountered signed tag %s; use "
|
||||
"--signed-tag=<mode> to handle it.",
|
||||
"--signed-tags=<mode> to handle it.",
|
||||
sha1_to_hex(tag->object.sha1));
|
||||
case WARN:
|
||||
warning ("Exporting signed tag %s",
|
||||
|
||||
2
commit.c
2
commit.c
@ -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)
|
||||
{
|
||||
|
||||
2
commit.h
2
commit.h
@ -166,7 +166,7 @@ extern struct commit_list *get_merge_bases(struct commit *rev1, struct commit *r
|
||||
extern 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 0x7fffffff
|
||||
|
||||
extern int register_shallow(const unsigned char *sha1);
|
||||
|
||||
@ -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 (Gloger@lrz.uni-muenchen.de).
|
||||
* Use last_remainder in more cases.
|
||||
* Pack bins using idea from colin@nyx10.cs.du.edu
|
||||
* 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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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 {
|
||||
|
||||
@ -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)
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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 &&
|
||||
|
||||
@ -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)"'' ""
|
||||
'
|
||||
|
||||
2
diff.c
2
diff.c
@ -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.
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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,
|
||||
|
||||
@ -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>;
|
||||
|
||||
4
kwset.c
4
kwset.c
@ -26,7 +26,7 @@
|
||||
The author may be reached (Email) at the address mike@ai.mit.edu,
|
||||
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
|
||||
|
||||
@ -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.
|
||||
|
||||
|
||||
@ -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
|
||||
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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.
|
||||
|
||||
|
||||
@ -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
|
||||
*/
|
||||
|
||||
@ -116,9 +116,9 @@ 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_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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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 ;;
|
||||
|
||||
@ -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 &&
|
||||
|
||||
@ -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 &&
|
||||
|
||||
@ -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 ) &&
|
||||
|
||||
@ -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 <patch@example.com>" --suppress-cc=sob --from="Example <nobody@example.com>" --to=nobody@example.com --smtp-server="$(pwd)/fake.sendmail" $patches 2>errors
|
||||
git send-email --envelope-sender="Patch Contributor <patch@example.com>" --suppress-cc=sob --from="Example <nobody@example.com>" --to=nobody@example.com --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 &&
|
||||
|
||||
@ -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];
|
||||
|
||||
@ -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);
|
||||
|
||||
12
wt-status.c
12
wt-status.c
@ -1225,14 +1225,10 @@ void wt_status_print(struct wt_status *s)
|
||||
if (advice_status_u_option && 2000 < s->untracked_in_ms) {
|
||||
status_printf_ln(s, GIT_COLOR_NORMAL, "");
|
||||
status_printf_ln(s, GIT_COLOR_NORMAL,
|
||||
_("It took %.2f seconds to enumerate untracked files."
|
||||
" 'status -uno'"),
|
||||
s->untracked_in_ms / 1000.0);
|
||||
status_printf_ln(s, GIT_COLOR_NORMAL,
|
||||
_("may speed it up, but you have to be careful not"
|
||||
" to forget to add"));
|
||||
status_printf_ln(s, GIT_COLOR_NORMAL,
|
||||
_("new files yourself (see 'git help status')."));
|
||||
_("It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
|
||||
"may speed it up, but you have to be careful not to forget to add\n"
|
||||
"new files yourself (see 'git help status')."),
|
||||
s->untracked_in_ms / 1000.0);
|
||||
}
|
||||
} else if (s->commitable)
|
||||
status_printf_ln(s, GIT_COLOR_NORMAL, _("Untracked files not listed%s"),
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user