Typos in code comments, an error message, documentation
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
0eb032d86c
commit
22e5e58a3c
@ -4,7 +4,7 @@ GIT v1.5.6.3 Release Notes
|
|||||||
Fixes since v1.5.6.2
|
Fixes since v1.5.6.2
|
||||||
--------------------
|
--------------------
|
||||||
|
|
||||||
* Setting core.sharerepository to traditional "true" value was supposed to make
|
* Setting core.sharedrepository to traditional "true" value was supposed to make
|
||||||
the repository group writable but should not affect permission for others.
|
the repository group writable but should not affect permission for others.
|
||||||
However, since 1.5.6, it was broken to drop permission for others when umask is
|
However, since 1.5.6, it was broken to drop permission for others when umask is
|
||||||
022, making the repository unreadable by others.
|
022, making the repository unreadable by others.
|
||||||
|
@ -17,7 +17,7 @@ Fixes since v1.6.0.1
|
|||||||
* Many commands did not use the correct working tree location when used
|
* Many commands did not use the correct working tree location when used
|
||||||
with GIT_WORK_TREE environment settings.
|
with GIT_WORK_TREE environment settings.
|
||||||
|
|
||||||
* Some systems needs to use compatibility fnmach and regex libraries
|
* Some systems need to use compatibility fnmatch and regex libraries
|
||||||
independent from each other; the compat/ area has been reorganized to
|
independent from each other; the compat/ area has been reorganized to
|
||||||
allow this.
|
allow this.
|
||||||
|
|
||||||
|
@ -11,7 +11,7 @@ Fixes since v1.6.4.2
|
|||||||
been deprecated.
|
been deprecated.
|
||||||
|
|
||||||
* "git fetch" and "git clone" had an extra sanity check to verify the
|
* "git fetch" and "git clone" had an extra sanity check to verify the
|
||||||
presense of the corresponding *.pack file before downloading *.idx
|
presence of the corresponding *.pack file before downloading *.idx
|
||||||
file by issuing a HEAD request. Github server however sometimes
|
file by issuing a HEAD request. Github server however sometimes
|
||||||
gave 500 (Internal server error) response to HEAD even if a GET
|
gave 500 (Internal server error) response to HEAD even if a GET
|
||||||
request for *.pack file to the same URL would have succeeded, and broke
|
request for *.pack file to the same URL would have succeeded, and broke
|
||||||
|
@ -26,7 +26,7 @@ Fixes since v1.6.5.3
|
|||||||
future versions, but not in this release,
|
future versions, but not in this release,
|
||||||
|
|
||||||
* "git merge -m <message> <branch>..." added the standard merge message
|
* "git merge -m <message> <branch>..." added the standard merge message
|
||||||
on its own after user-supplied message, which should have overrided the
|
on its own after user-supplied message, which should have overridden the
|
||||||
standard one.
|
standard one.
|
||||||
|
|
||||||
Other minor documentation updates are included.
|
Other minor documentation updates are included.
|
||||||
|
@ -10,7 +10,7 @@ Fixes since v1.6.5.6
|
|||||||
an older version of git should just ignore them. Instead we diagnosed
|
an older version of git should just ignore them. Instead we diagnosed
|
||||||
it as an error.
|
it as an error.
|
||||||
|
|
||||||
* With help.autocorrect set to non-zero value, the logic to guess typoes
|
* With help.autocorrect set to non-zero value, the logic to guess typos
|
||||||
in the subcommand name misfired and ran a random nonsense command.
|
in the subcommand name misfired and ran a random nonsense command.
|
||||||
|
|
||||||
* If a command is run with an absolute path as a pathspec inside a bare
|
* If a command is run with an absolute path as a pathspec inside a bare
|
||||||
|
@ -29,7 +29,7 @@ or adjust to the new behaviour, on the day their sysadmin decides to install
|
|||||||
the new version of git. When we switched from "git-foo" to "git foo" in
|
the new version of git. When we switched from "git-foo" to "git foo" in
|
||||||
1.6.0, even though the change had been advertised and the transition
|
1.6.0, even though the change had been advertised and the transition
|
||||||
guide had been provided for a very long time, the users procrastinated
|
guide had been provided for a very long time, the users procrastinated
|
||||||
during the entire transtion period, and ended up panicking on the day
|
during the entire transition period, and ended up panicking on the day
|
||||||
their sysadmins updated their git installation. We are trying to avoid
|
their sysadmins updated their git installation. We are trying to avoid
|
||||||
repeating that unpleasantness in the 1.7.0 release.
|
repeating that unpleasantness in the 1.7.0 release.
|
||||||
|
|
||||||
@ -94,7 +94,7 @@ users will fare this time.
|
|||||||
* "git diff" traditionally treated various "ignore whitespace" options
|
* "git diff" traditionally treated various "ignore whitespace" options
|
||||||
only as a way to filter the patch output. "git diff --exit-code -b"
|
only as a way to filter the patch output. "git diff --exit-code -b"
|
||||||
exited with non-zero status even if all changes were about changing the
|
exited with non-zero status even if all changes were about changing the
|
||||||
ammount of whitespace and nothing else. and "git diff -b" showed the
|
amount of whitespace and nothing else. and "git diff -b" showed the
|
||||||
"diff --git" header line for such a change without patch text.
|
"diff --git" header line for such a change without patch text.
|
||||||
|
|
||||||
In 1.7.0, the "ignore whitespaces" will affect the semantics of the
|
In 1.7.0, the "ignore whitespaces" will affect the semantics of the
|
||||||
|
@ -202,7 +202,7 @@ release, unless otherwise noted.
|
|||||||
the branch is fully merged to its upstream branch if it is not merged
|
the branch is fully merged to its upstream branch if it is not merged
|
||||||
to the current branch. It now deletes it in such a case.
|
to the current branch. It now deletes it in such a case.
|
||||||
|
|
||||||
* "fiter-branch" command incorrectly said --prune-empty and --filter-commit
|
* "filter-branch" command incorrectly said --prune-empty and --filter-commit
|
||||||
were incompatible; the latter should be read as --commit-filter.
|
were incompatible; the latter should be read as --commit-filter.
|
||||||
|
|
||||||
* When using "git status" or asking "git diff" to compare the work tree
|
* When using "git status" or asking "git diff" to compare the work tree
|
||||||
|
@ -229,7 +229,7 @@ reverting W. Mainline's history would look like this:
|
|||||||
A---B---C
|
A---B---C
|
||||||
|
|
||||||
But if you don't actually need to change commit A, then you need some way to
|
But if you don't actually need to change commit A, then you need some way to
|
||||||
recreate it as a new commit with the same changes in it. The rebase commmand's
|
recreate it as a new commit with the same changes in it. The rebase command's
|
||||||
--no-ff option provides a way to do this:
|
--no-ff option provides a way to do this:
|
||||||
|
|
||||||
$ git rebase [-i] --no-ff P
|
$ git rebase [-i] --no-ff P
|
||||||
|
@ -2376,11 +2376,11 @@ parse_done:
|
|||||||
*
|
*
|
||||||
* The remaining are:
|
* The remaining are:
|
||||||
*
|
*
|
||||||
* (1) if dashdash_pos != 0, its either
|
* (1) if dashdash_pos != 0, it is either
|
||||||
* "blame [revisions] -- <path>" or
|
* "blame [revisions] -- <path>" or
|
||||||
* "blame -- <path> <rev>"
|
* "blame -- <path> <rev>"
|
||||||
*
|
*
|
||||||
* (2) otherwise, its one of the two:
|
* (2) otherwise, it is one of the two:
|
||||||
* "blame [revisions] <path>"
|
* "blame [revisions] <path>"
|
||||||
* "blame <path> <rev>"
|
* "blame <path> <rev>"
|
||||||
*
|
*
|
||||||
|
@ -641,7 +641,7 @@ static char *lookup_prog(const char *dir, const char *cmd, int isexe, int exe_on
|
|||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Determines the absolute path of cmd using the the split path in path.
|
* Determines the absolute path of cmd using the split path in path.
|
||||||
* If cmd contains a slash or backslash, no lookup is performed.
|
* If cmd contains a slash or backslash, no lookup is performed.
|
||||||
*/
|
*/
|
||||||
static char *path_lookup(const char *cmd, char **path, int exe_only)
|
static char *path_lookup(const char *cmd, char **path, int exe_only)
|
||||||
|
@ -2069,7 +2069,7 @@ static void init_malloc_global_mutex() {
|
|||||||
Each freshly allocated chunk must have both cinuse and pinuse set.
|
Each freshly allocated chunk must have both cinuse and pinuse set.
|
||||||
That is, each allocated chunk borders either a previously allocated
|
That is, each allocated chunk borders either a previously allocated
|
||||||
and still in-use chunk, or the base of its memory arena. This is
|
and still in-use chunk, or the base of its memory arena. This is
|
||||||
ensured by making all allocations from the the `lowest' part of any
|
ensured by making all allocations from the `lowest' part of any
|
||||||
found chunk. Further, no free chunk physically borders another one,
|
found chunk. Further, no free chunk physically borders another one,
|
||||||
so each free chunk is known to be preceded and followed by either
|
so each free chunk is known to be preceded and followed by either
|
||||||
inuse chunks or the ends of memory.
|
inuse chunks or the ends of memory.
|
||||||
|
@ -3122,7 +3122,7 @@ re_match (bufp, string, size, pos, regs)
|
|||||||
|
|
||||||
|
|
||||||
/* re_match_2 matches the compiled pattern in BUFP against the
|
/* re_match_2 matches the compiled pattern in BUFP against the
|
||||||
the (virtual) concatenation of STRING1 and STRING2 (of length SIZE1
|
(virtual) concatenation of STRING1 and STRING2 (of length SIZE1
|
||||||
and SIZE2, respectively). We start matching at POS, and stop
|
and SIZE2, respectively). We start matching at POS, and stop
|
||||||
matching at STOP.
|
matching at STOP.
|
||||||
|
|
||||||
|
@ -54,13 +54,13 @@ then
|
|||||||
die "destination directory '$new_workdir' already exists."
|
die "destination directory '$new_workdir' already exists."
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# make sure the the links use full paths
|
# make sure the links use full paths
|
||||||
git_dir=$(cd "$git_dir"; pwd)
|
git_dir=$(cd "$git_dir"; pwd)
|
||||||
|
|
||||||
# create the workdir
|
# create the workdir
|
||||||
mkdir -p "$new_workdir/.git" || die "unable to create \"$new_workdir\"!"
|
mkdir -p "$new_workdir/.git" || die "unable to create \"$new_workdir\"!"
|
||||||
|
|
||||||
# create the links to the original repo. explictly exclude index, HEAD and
|
# create the links to the original repo. explicitly exclude index, HEAD and
|
||||||
# logs/HEAD from the list since they are purely related to the current working
|
# logs/HEAD from the list since they are purely related to the current working
|
||||||
# directory, and should not be shared.
|
# directory, and should not be shared.
|
||||||
for x in config refs logs/refs objects info hooks packed-refs remotes rr-cache svn
|
for x in config refs logs/refs objects info hooks packed-refs remotes rr-cache svn
|
||||||
|
@ -95,7 +95,7 @@ You can specify the following configuration variables when building GIT:
|
|||||||
in the browser's URL bar and next to site name in bookmarks). Relative
|
in the browser's URL bar and next to site name in bookmarks). Relative
|
||||||
to base URI of gitweb. [Default: static/git-favicon.png]
|
to base URI of gitweb. [Default: static/git-favicon.png]
|
||||||
* GITWEB_JS
|
* GITWEB_JS
|
||||||
Points to the localtion where you put gitweb.js on your web server
|
Points to the location where you put gitweb.js on your web server
|
||||||
(or to be more generic URI of JavaScript code used by gitweb).
|
(or to be more generic URI of JavaScript code used by gitweb).
|
||||||
Relative to base URI of gitweb. [Default: static/gitweb.js (or
|
Relative to base URI of gitweb. [Default: static/gitweb.js (or
|
||||||
static/gitweb.min.js if JSMIN build variable is defined / JavaScript
|
static/gitweb.min.js if JSMIN build variable is defined / JavaScript
|
||||||
@ -233,7 +233,7 @@ not include variables usually directly set during build):
|
|||||||
is false.
|
is false.
|
||||||
* $maxload
|
* $maxload
|
||||||
Used to set the maximum load that we will still respond to gitweb queries.
|
Used to set the maximum load that we will still respond to gitweb queries.
|
||||||
If server load exceed this value then return "503 Service Unavaliable" error.
|
If server load exceed this value then return "503 Service Unavailable" error.
|
||||||
Server load is taken to be 0 if gitweb cannot determine its value. Set it to
|
Server load is taken to be 0 if gitweb cannot determine its value. Set it to
|
||||||
undefined value to turn it off. The default is 300.
|
undefined value to turn it off. The default is 300.
|
||||||
|
|
||||||
|
@ -245,7 +245,7 @@ our %feature = (
|
|||||||
# return value of feature-sub indicates if to enable specified feature
|
# return value of feature-sub indicates if to enable specified feature
|
||||||
#
|
#
|
||||||
# if there is no 'sub' key (no feature-sub), then feature cannot be
|
# if there is no 'sub' key (no feature-sub), then feature cannot be
|
||||||
# overriden
|
# overridden
|
||||||
#
|
#
|
||||||
# use gitweb_get_feature(<feature>) to retrieve the <feature> value
|
# use gitweb_get_feature(<feature>) to retrieve the <feature> value
|
||||||
# (an array) or gitweb_check_feature(<feature>) to check if <feature>
|
# (an array) or gitweb_check_feature(<feature>) to check if <feature>
|
||||||
@ -1323,7 +1323,7 @@ sub esc_param {
|
|||||||
return $str;
|
return $str;
|
||||||
}
|
}
|
||||||
|
|
||||||
# quote unsafe chars in whole URL, so some charactrs cannot be quoted
|
# quote unsafe chars in whole URL, so some characters cannot be quoted
|
||||||
sub esc_url {
|
sub esc_url {
|
||||||
my $str = shift;
|
my $str = shift;
|
||||||
return undef unless defined $str;
|
return undef unless defined $str;
|
||||||
@ -3782,9 +3782,9 @@ sub git_print_authorship {
|
|||||||
}
|
}
|
||||||
|
|
||||||
# Outputs table rows containing the full author or committer information,
|
# Outputs table rows containing the full author or committer information,
|
||||||
# in the format expected for 'commit' view (& similia).
|
# in the format expected for 'commit' view (& similar).
|
||||||
# Parameters are a commit hash reference, followed by the list of people
|
# Parameters are a commit hash reference, followed by the list of people
|
||||||
# to output information for. If the list is empty it defalts to both
|
# to output information for. If the list is empty it defaults to both
|
||||||
# author and committer.
|
# author and committer.
|
||||||
sub git_print_authorship_rows {
|
sub git_print_authorship_rows {
|
||||||
my $co = shift;
|
my $co = shift;
|
||||||
@ -4513,8 +4513,8 @@ sub git_patchset_body {
|
|||||||
print "</div>\n"; # class="patch"
|
print "</div>\n"; # class="patch"
|
||||||
}
|
}
|
||||||
|
|
||||||
# for compact combined (--cc) format, with chunk and patch simpliciaction
|
# for compact combined (--cc) format, with chunk and patch simplification
|
||||||
# patchset might be empty, but there might be unprocessed raw lines
|
# the patchset might be empty, but there might be unprocessed raw lines
|
||||||
for (++$patch_idx if $patch_number > 0;
|
for (++$patch_idx if $patch_number > 0;
|
||||||
$patch_idx < @$difftree;
|
$patch_idx < @$difftree;
|
||||||
++$patch_idx) {
|
++$patch_idx) {
|
||||||
|
2
graph.c
2
graph.c
@ -439,7 +439,7 @@ static void graph_update_width(struct git_graph *graph,
|
|||||||
max_cols++;
|
max_cols++;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* We added a column for the the current commit as part of
|
* We added a column for the current commit as part of
|
||||||
* graph->num_parents. If the current commit was already in
|
* graph->num_parents. If the current commit was already in
|
||||||
* graph->columns, then we have double counted it.
|
* graph->columns, then we have double counted it.
|
||||||
*/
|
*/
|
||||||
|
@ -77,7 +77,7 @@ static int verify_packfile(struct packed_git *p,
|
|||||||
err = error("%s SHA1 checksum mismatch",
|
err = error("%s SHA1 checksum mismatch",
|
||||||
p->pack_name);
|
p->pack_name);
|
||||||
if (hashcmp(index_base + index_size - 40, pack_sig))
|
if (hashcmp(index_base + index_size - 40, pack_sig))
|
||||||
err = error("%s SHA1 does not match its inddex",
|
err = error("%s SHA1 does not match its index",
|
||||||
p->pack_name);
|
p->pack_name);
|
||||||
unuse_pack(w_curs);
|
unuse_pack(w_curs);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user