Merge branch 'en/doc-typofix'
Docfix. * en/doc-typofix: Fix spelling errors in no-longer-updated-from-upstream modules multimail: fix a few simple spelling errors sha1dc: fix trivial comment spelling error Fix spelling errors in test commands Fix spelling errors in messages shown to users Fix spelling errors in names of tests Fix spelling errors in comments of testcases Fix spelling errors in code comments Fix spelling errors in documentation outside of Documentation/ Documentation: fix a bunch of typos, both old and newmaint
Junio C Hamano
commit
d3096d2ba6
|
|
@ -75,7 +75,7 @@ For shell scripts specifically (not exhaustive):
|
|||
|
||||
- If you want to find out if a command is available on the user's
|
||||
$PATH, you should use 'type <command>', instead of 'which <command>'.
|
||||
The output of 'which' is not machine parseable and its exit code
|
||||
The output of 'which' is not machine parsable and its exit code
|
||||
is not reliable across platforms.
|
||||
|
||||
- We use POSIX compliant parameter substitutions and avoid bashisms;
|
||||
|
|
@ -203,7 +203,7 @@ For C programs:
|
|||
. since early 2012 with e1327023ea, we have been using an enum
|
||||
definition whose last element is followed by a comma. This, like
|
||||
an array initializer that ends with a trailing comma, can be used
|
||||
to reduce the patch noise when adding a new identifer at the end.
|
||||
to reduce the patch noise when adding a new identifier at the end.
|
||||
|
||||
. since mid 2017 with cbc0f81d, we have been using designated
|
||||
initializers for struct (e.g. "struct t v = { .val = 'a' };").
|
||||
|
|
|
|||
|
|
@ -251,7 +251,7 @@ Updates in v1.5.0 since v1.4.4 series
|
|||
the repository when that happens.
|
||||
|
||||
|
||||
* Crufts removal
|
||||
* Cruft removal
|
||||
|
||||
- We used to say "old commits are retrievable using reflog and
|
||||
'master@{yesterday}' syntax as long as you haven't run
|
||||
|
|
@ -379,7 +379,7 @@ Updates in v1.5.0 since v1.4.4 series
|
|||
- The value of i18n.commitencoding in the originating
|
||||
repository is recorded in the commit object on the "encoding"
|
||||
header, if it is not UTF-8. git-log and friends notice this,
|
||||
and reencodes the message to the log output encoding when
|
||||
and re-encodes the message to the log output encoding when
|
||||
displaying, if they are different. The log output encoding
|
||||
is determined by "git log --encoding=<encoding>",
|
||||
i18n.logoutputencoding configuration, or i18n.commitencoding
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ Fixes since v1.6.5.3
|
|||
|
||||
* "git prune-packed" gave progress output even when its standard error is
|
||||
not connected to a terminal; this caused cron jobs that run it to
|
||||
produce crufts.
|
||||
produce cruft.
|
||||
|
||||
* "git pack-objects --all-progress" is an option to ask progress output
|
||||
from write-object phase _if_ progress output were to be produced, and
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ Fixes since v1.7.0.1
|
|||
* "git status" in 1.7.0 lacked the optimization we used to have in 1.6.X series
|
||||
to speed up scanning of large working tree.
|
||||
|
||||
* "gitweb" did not diagnose parsing errors properly while reading tis configuration
|
||||
* "gitweb" did not diagnose parsing errors properly while reading its configuration
|
||||
file.
|
||||
|
||||
And other minor fixes and documentation updates.
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ Fixes since v1.7.10.3
|
|||
* The message file for Swedish translation has been updated a bit.
|
||||
|
||||
* A name taken from mailmap was copied into an internal buffer
|
||||
incorrectly and could overun the buffer if it is too long.
|
||||
incorrectly and could overrun the buffer if it is too long.
|
||||
|
||||
* A malformed commit object that has a header line chomped in the
|
||||
middle could kill git with a NULL pointer dereference.
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ Fixes since v1.7.12.2
|
|||
its Accept-Encoding header.
|
||||
|
||||
* "git receive-pack" (the counterpart to "git push") did not give
|
||||
progress output while processing objects it received to the puser
|
||||
progress output while processing objects it received to the user
|
||||
when run over the smart-http protocol.
|
||||
|
||||
* "git status" honored the ignore=dirty settings in .gitmodules but
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ Fixes since v1.7.5.2
|
|||
* "git log --stdin path" with an input that has additional pathspec
|
||||
used to corrupt memory.
|
||||
|
||||
* "git send-pack" (hence "git push") over smalt-HTTP protocol could
|
||||
* "git send-pack" (hence "git push") over smart-HTTP protocol could
|
||||
deadlock when the client side pack-object died early.
|
||||
|
||||
* Compressed tarball gitweb generates used to be made with the timestamp
|
||||
|
|
|
|||
|
|
@ -233,7 +233,7 @@ to them for details).
|
|||
together, misdetected branches.
|
||||
|
||||
* "git receive-pack" (the counterpart to "git push") did not give
|
||||
progress output while processing objects it received to the puser
|
||||
progress output while processing objects it received to the user
|
||||
when run over the smart-http protocol.
|
||||
|
||||
* When you misspell the command name you give to the "exec" action in
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ Fixes since v1.8.4
|
|||
in 1.8.4-rc1).
|
||||
|
||||
* "git rebase -i" and other scripted commands were feeding a
|
||||
random, data dependant error message to 'echo' and expecting it
|
||||
random, data dependent error message to 'echo' and expecting it
|
||||
to come out literally.
|
||||
|
||||
* Setting the "submodule.<name>.path" variable to the empty
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ Git v2.1.3 Release Notes
|
|||
they are new enough to support the `--output` option.
|
||||
|
||||
* "git pack-objects" forgot to disable the codepath to generate
|
||||
object recheability bitmap when it needs to split the resulting
|
||||
object reachability bitmap when it needs to split the resulting
|
||||
pack.
|
||||
|
||||
* "gitweb" used deprecated CGI::startfrom, which was removed from
|
||||
|
|
|
|||
|
|
@ -478,7 +478,7 @@ notes for details).
|
|||
* One part of "git am" had an oddball helper function that called
|
||||
stuff from outside "his" as opposed to calling what we have "ours",
|
||||
which was not gender-neutral and also inconsistent with the rest of
|
||||
the system where outside stuff is usuall called "theirs" in
|
||||
the system where outside stuff is usually called "theirs" in
|
||||
contrast to "ours".
|
||||
|
||||
* "git blame file" allowed the lineage of lines in the uncommitted,
|
||||
|
|
|
|||
|
|
@ -86,7 +86,7 @@ Fixes since v2.10.1
|
|||
by refusing to check out a branch that is already checked out in
|
||||
another worktree. However, this also prevented checking out a
|
||||
branch, which is designated as the primary branch of a bare
|
||||
reopsitory, in a worktree that is connected to the bare
|
||||
repository, in a worktree that is connected to the bare
|
||||
repository. The check has been corrected to allow it.
|
||||
|
||||
* "git rebase" immediately after "git clone" failed to find the fork
|
||||
|
|
|
|||
|
|
@ -104,7 +104,7 @@ Fixes since v2.11
|
|||
"git difftool --dir-diff" from a subdirectory never worked. This
|
||||
has been fixed.
|
||||
|
||||
* "git p4" that tracks multile p4 paths imported a single changelist
|
||||
* "git p4" that tracks multiple p4 paths imported a single changelist
|
||||
that touches files in these multiple paths as one commit, followed
|
||||
by many empty commits. This has been fixed.
|
||||
|
||||
|
|
|
|||
|
|
@ -315,7 +315,7 @@ notes for details).
|
|||
"git difftool --dir-diff" from a subdirectory never worked. This
|
||||
has been fixed.
|
||||
|
||||
* "git p4" that tracks multile p4 paths imported a single changelist
|
||||
* "git p4" that tracks multiple p4 paths imported a single changelist
|
||||
that touches files in these multiple paths as one commit, followed
|
||||
by many empty commits. This has been fixed.
|
||||
|
||||
|
|
|
|||
|
|
@ -177,7 +177,7 @@ UI, Workflows & Features
|
|||
been changed to enable "--decorate".
|
||||
|
||||
* The output from "git status --short" has been extended to show
|
||||
various kinds of dirtyness in submodules differently; instead of to
|
||||
various kinds of dirtiness in submodules differently; instead of to
|
||||
"M" for modified, 'm' and '?' can be shown to signal changes only
|
||||
to the working tree of the submodule but not the commit that is
|
||||
checked out.
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ Fixes since v2.13.2
|
|||
* The code to pick up and execute command alias definition from the
|
||||
configuration used to switch to the top of the working tree and
|
||||
then come back when the expanded alias was executed, which was
|
||||
unnecessarilyl complex. Attempt to simplify the logic by using the
|
||||
unnecessarily complex. Attempt to simplify the logic by using the
|
||||
early-config mechanism that does not chdir around.
|
||||
|
||||
* "git add -p" were updated in 2.12 timeframe to cope with custom
|
||||
|
|
@ -35,7 +35,7 @@ Fixes since v2.13.2
|
|||
* Fix a recent regression to "git rebase -i" and add tests that would
|
||||
have caught it and others.
|
||||
|
||||
* An unaligned 32-bit access in pack-bitmap code ahs been corrected.
|
||||
* An unaligned 32-bit access in pack-bitmap code has been corrected.
|
||||
|
||||
* Tighten error checks for invalid "git apply" input.
|
||||
|
||||
|
|
|
|||
|
|
@ -141,7 +141,7 @@ Performance, Internal Implementation, Development Support etc.
|
|||
* Some platforms have ulong that is smaller than time_t, and our
|
||||
historical use of ulong for timestamp would mean they cannot
|
||||
represent some timestamp that the platform allows. Invent a
|
||||
separate and dedicated timestamp_t (so that we can distingiuish
|
||||
separate and dedicated timestamp_t (so that we can distinguish
|
||||
timestamps and a vanilla ulongs, which along is already a good
|
||||
move), and then declare uintmax_t is the type to be used as the
|
||||
timestamp_t.
|
||||
|
|
@ -442,7 +442,7 @@ notes for details).
|
|||
* The code to pick up and execute command alias definition from the
|
||||
configuration used to switch to the top of the working tree and
|
||||
then come back when the expanded alias was executed, which was
|
||||
unnecessarilyl complex. Attempt to simplify the logic by using the
|
||||
unnecessarily complex. Attempt to simplify the logic by using the
|
||||
early-config mechanism that does not chdir around.
|
||||
|
||||
* Fix configuration codepath to pay proper attention to commondir
|
||||
|
|
|
|||
|
|
@ -407,7 +407,7 @@ Fixes since v2.15
|
|||
(merge eef3df5a93 bw/pathspec-match-submodule-boundary later to maint).
|
||||
|
||||
* Amending commits in git-gui broke the author name that is non-ascii
|
||||
due to incorrect enconding conversion.
|
||||
due to incorrect encoding conversion.
|
||||
|
||||
* Recent update to the submodule configuration code broke "diff-tree"
|
||||
by accidentally stopping to read from the index upfront.
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ Fixes since v2.16.2
|
|||
|
||||
* The http tracing code, often used to debug connection issues,
|
||||
learned to redact potentially sensitive information from its output
|
||||
so that it can be more safely sharable.
|
||||
so that it can be more safely shareable.
|
||||
|
||||
* Crash fix for a corner case where an error codepath tried to unlock
|
||||
what it did not acquire lock on.
|
||||
|
|
|
|||
|
|
@ -216,7 +216,7 @@ Fixes since v2.16
|
|||
|
||||
* The http tracing code, often used to debug connection issues,
|
||||
learned to redact potentially sensitive information from its output
|
||||
so that it can be more safely sharable.
|
||||
so that it can be more safely shareable.
|
||||
(merge 8ba18e6fa4 jt/http-redact-cookies later to maint).
|
||||
|
||||
* Crash fix for a corner case where an error codepath tried to unlock
|
||||
|
|
|
|||
|
|
@ -179,7 +179,7 @@ Performance, Internal Implementation, Development Support etc.
|
|||
(merge 00a3da2a13 nd/remove-ignore-env-field later to maint).
|
||||
|
||||
* Code to find the length to uniquely abbreviate object names based
|
||||
on packfile content, which is a relatively recent addtion, has been
|
||||
on packfile content, which is a relatively recent addition, has been
|
||||
optimized to use the same fan-out table.
|
||||
|
||||
* The mechanism to use parse-options API to automate the command line
|
||||
|
|
|
|||
|
|
@ -106,7 +106,7 @@ Performance, Internal Implementation, Development Support etc.
|
|||
* The conversion to pass "the_repository" and then "a_repository"
|
||||
throughout the object access API continues.
|
||||
|
||||
* Continuing with the idea to programatically enumerate various
|
||||
* Continuing with the idea to programmatically enumerate various
|
||||
pieces of data required for command line completion, teach the
|
||||
codebase to report the list of configuration variables
|
||||
subcommands care about to help complete them.
|
||||
|
|
|
|||
|
|
@ -119,7 +119,7 @@ UI, Workflows & Features
|
|||
alias expansion.
|
||||
|
||||
* The documentation of "git gc" has been updated to mention that it
|
||||
is no longer limited to "pruning away crufts" but also updates
|
||||
is no longer limited to "pruning away cruft" but also updates
|
||||
ancillary files like commit-graph as a part of repository
|
||||
optimization.
|
||||
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ Fixes since v2.3.2
|
|||
* Description given by "grep -h" for its --exclude-standard option
|
||||
was phrased poorly.
|
||||
|
||||
* Documentaton for "git remote add" mentioned "--tags" and
|
||||
* Documentation for "git remote add" mentioned "--tags" and
|
||||
"--no-tags" and it was not clear that fetch from the remote in
|
||||
the future will use the default behaviour when neither is given
|
||||
to override it.
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ Git v2.3.7 Release Notes
|
|||
Fixes since v2.3.6
|
||||
------------------
|
||||
|
||||
* An earlier update to the parser that disects a URL broke an
|
||||
* An earlier update to the parser that dissects a URL broke an
|
||||
address, followed by a colon, followed by an empty string (instead
|
||||
of the port number), e.g. ssh://example.com:/path/to/repo.
|
||||
|
||||
|
|
|
|||
|
|
@ -66,7 +66,7 @@ Fixes since v2.4.3
|
|||
* Some time ago, "git blame" (incorrectly) lost the convert_to_git()
|
||||
call when synthesizing a fake "tip" commit that represents the
|
||||
state in the working tree, which broke folks who record the history
|
||||
with LF line ending to make their project portabile across
|
||||
with LF line ending to make their project portable across
|
||||
platforms while terminating lines in their working tree files with
|
||||
CRLF for their platform.
|
||||
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ UI, Workflows & Features
|
|||
|
||||
* "git interpret-trailers" can now run outside of a Git repository.
|
||||
|
||||
* "git p4" learned to reencode the pathname it uses to communicate
|
||||
* "git p4" learned to re-encode the pathname it uses to communicate
|
||||
with the p4 depot with a new option.
|
||||
|
||||
* Give progress meter to "git filter-branch".
|
||||
|
|
|
|||
|
|
@ -189,7 +189,7 @@ Performance, Internal Implementation, Development Support etc.
|
|||
* Some calls to strcpy(3) triggers a false warning from static
|
||||
analyzers that are less intelligent than humans, and reducing the
|
||||
number of these false hits helps us notice real issues. A few
|
||||
calls to strcpy(3) in a couple of protrams that are already safe
|
||||
calls to strcpy(3) in a couple of programs that are already safe
|
||||
has been rewritten to avoid false warnings.
|
||||
|
||||
* The "name_path" API was an attempt to reduce the need to construct
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ Fixes since v2.9.2
|
|||
* One part of "git am" had an oddball helper function that called
|
||||
stuff from outside "his" as opposed to calling what we have "ours",
|
||||
which was not gender-neutral and also inconsistent with the rest of
|
||||
the system where outside stuff is usuall called "theirs" in
|
||||
the system where outside stuff is usually called "theirs" in
|
||||
contrast to "ours".
|
||||
|
||||
* The test framework learned a new helper test_match_signal to
|
||||
|
|
|
|||
|
|
@ -142,7 +142,7 @@ refer to linkgit:gitignore[5] for details. For convenience:
|
|||
|
||||
`gitdir/i`::
|
||||
This is the same as `gitdir` except that matching is done
|
||||
case-insensitively (e.g. on case-insensitive file sytems)
|
||||
case-insensitively (e.g. on case-insensitive file systems)
|
||||
|
||||
`onbranch`::
|
||||
The data that follows the keyword `onbranch:` is taken to be a
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ tag.gpgSign::
|
|||
Use of this option when running in an automated script can
|
||||
result in a large number of tags being signed. It is therefore
|
||||
convenient to use an agent to avoid typing your gpg passphrase
|
||||
several times. Note that this option doesn't affects tag signing
|
||||
several times. Note that this option doesn't affect tag signing
|
||||
behavior enabled by "-u <keyid>" or "--local-user=<keyid>" options.
|
||||
|
||||
tar.umask::
|
||||
|
|
|
|||
|
|
@ -158,7 +158,7 @@ Test suites are very nice. But when they are used alone, they are
|
|||
supposed to be used so that all the tests are checked after each
|
||||
commit. This means that they are not very efficient, because many
|
||||
tests are run for no interesting result, and they suffer from
|
||||
combinational explosion.
|
||||
combinatorial explosion.
|
||||
|
||||
In fact the problem is that big software often has many different
|
||||
configuration options and that each test case should pass for each
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ OPTIONS
|
|||
instead of from the command-line.
|
||||
|
||||
-z::
|
||||
The output format is modified to be machine-parseable.
|
||||
The output format is modified to be machine-parsable.
|
||||
If `--stdin` is also given, input paths are separated
|
||||
with a NUL character instead of a linefeed character.
|
||||
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ OPTIONS
|
|||
instead of from the command-line.
|
||||
|
||||
-z::
|
||||
The output format is modified to be machine-parseable (see
|
||||
The output format is modified to be machine-parsable (see
|
||||
below). If `--stdin` is also given, input paths are separated
|
||||
with a NUL character instead of a linefeed character.
|
||||
|
||||
|
|
|
|||
|
|
@ -294,7 +294,7 @@ In `dbDriver` and `dbUser` you can use the following variables:
|
|||
Git directory name
|
||||
%g::
|
||||
Git directory name, where all characters except for
|
||||
alpha-numeric ones, `.`, and `-` are replaced with
|
||||
alphanumeric ones, `.`, and `-` are replaced with
|
||||
`_` (this should make it easier to use the directory
|
||||
name in a filename if wanted)
|
||||
%m::
|
||||
|
|
|
|||
|
|
@ -142,7 +142,7 @@ by keeping the marks the same across runs.
|
|||
Specify how to handle `encoding` header in commit objects. When
|
||||
asking to 'abort' (which is the default), this program will die
|
||||
when encountering such a commit object. With 'yes', the commit
|
||||
message will be reencoded into UTF-8. With 'no', the original
|
||||
message will be re-encoded into UTF-8. With 'no', the original
|
||||
encoding will be preserved.
|
||||
|
||||
--refspec::
|
||||
|
|
|
|||
|
|
@ -534,7 +534,7 @@ repo-filter' also provides
|
|||
https://github.com/newren/git-filter-repo/blob/master/contrib/filter-repo-demos/filter-lamely[filter-lamely],
|
||||
a drop-in git-filter-branch replacement (with a few caveats). While
|
||||
filter-lamely suffers from all the same safety issues as
|
||||
git-filter-branch, it at least ameloriates the performance issues a
|
||||
git-filter-branch, it at least ameliorates the performance issues a
|
||||
little.
|
||||
|
||||
[[SAFETY]]
|
||||
|
|
|
|||
|
|
@ -242,7 +242,7 @@ corresponding.
|
|||
|
||||
The overall time needed to compute this algorithm is the time needed to
|
||||
compute n+m commit diffs and then n*m diffs of patches, plus the time
|
||||
needed to compute the least-cost assigment between n and m diffs. Git
|
||||
needed to compute the least-cost assignment between n and m diffs. Git
|
||||
uses an implementation of the Jonker-Volgenant algorithm to solve the
|
||||
assignment problem, which has cubic runtime complexity. The matching
|
||||
found in this case will look like this:
|
||||
|
|
|
|||
|
|
@ -65,7 +65,7 @@ OPTIONS
|
|||
--sign::
|
||||
Make a GPG-signed tag, using the default e-mail address's key.
|
||||
The default behavior of tag GPG-signing is controlled by `tag.gpgSign`
|
||||
configuration variable if it exists, or disabled oder otherwise.
|
||||
configuration variable if it exists, or disabled otherwise.
|
||||
See linkgit:git-config[1].
|
||||
|
||||
--no-sign::
|
||||
|
|
|
|||
|
|
@ -432,7 +432,7 @@ specified by the splitIndex.sharedIndexExpire config variable (see
|
|||
linkgit:git-config[1]).
|
||||
|
||||
To avoid deleting a shared index file that is still used, its
|
||||
modification time is updated to the current time everytime a new split
|
||||
modification time is updated to the current time every time a new split
|
||||
index based on the shared index file is either created or read from.
|
||||
|
||||
UNTRACKED CACHE
|
||||
|
|
|
|||
|
|
@ -271,8 +271,8 @@ In general, the interrogate commands do not touch the files in
|
|||
the working tree.
|
||||
|
||||
|
||||
Synching repositories
|
||||
~~~~~~~~~~~~~~~~~~~~~
|
||||
Syncing repositories
|
||||
~~~~~~~~~~~~~~~~~~~~
|
||||
|
||||
include::cmds-synchingrepositories.txt[]
|
||||
|
||||
|
|
|
|||
|
|
@ -293,10 +293,10 @@ web front ends do not visualize the contents of these files by default.
|
|||
|
||||
In these cases you can tell Git the encoding of a file in the working
|
||||
directory with the `working-tree-encoding` attribute. If a file with this
|
||||
attribute is added to Git, then Git reencodes the content from the
|
||||
attribute is added to Git, then Git re-encodes the content from the
|
||||
specified encoding to UTF-8. Finally, Git stores the UTF-8 encoded
|
||||
content in its internal data structure (called "the index"). On checkout
|
||||
the content is reencoded back to the specified encoding.
|
||||
the content is re-encoded back to the specified encoding.
|
||||
|
||||
Please note that using the `working-tree-encoding` attribute may have a
|
||||
number of pitfalls:
|
||||
|
|
@ -498,7 +498,7 @@ command. This is achieved by using the long-running process protocol
|
|||
When Git encounters the first file that needs to be cleaned or smudged,
|
||||
it starts the filter and performs the handshake. In the handshake, the
|
||||
welcome message sent by Git is "git-filter-client", only version 2 is
|
||||
suppported, and the supported capabilities are "clean", "smudge", and
|
||||
supported, and the supported capabilities are "clean", "smudge", and
|
||||
"delay".
|
||||
|
||||
Afterwards Git sends a list of "key=value" pairs terminated with
|
||||
|
|
|
|||
|
|
@ -81,7 +81,7 @@ submodule.<name>.ignore::
|
|||
Committed differences and modifications to tracked files will show
|
||||
up.
|
||||
|
||||
none;; No modifiations to submodules are ignored, all of committed
|
||||
none;; No modifications to submodules are ignored, all of committed
|
||||
differences, and modifications to tracked and untracked files are
|
||||
shown. This is the default option.
|
||||
|
||||
|
|
|
|||
|
|
@ -81,7 +81,7 @@ After I am done, I'd try a pretend-merge between "topicA" and
|
|||
o---o---o---o---o---o
|
||||
|
||||
The last diff better not to show anything other than cleanups
|
||||
for crufts. Then I can finally clean things up:
|
||||
for cruft. Then I can finally clean things up:
|
||||
|
||||
$ git branch -D topic
|
||||
$ git reset --hard HEAD^ ;# nuke pretend merge
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ set to `no` at the beginning of them.
|
|||
|
||||
--cleanup=<mode>::
|
||||
This option determines how the merge message will be cleaned up before
|
||||
commiting. See linkgit:git-commit[1] for more details. In addition, if
|
||||
committing. See linkgit:git-commit[1] for more details. In addition, if
|
||||
the '<mode>' is given a value of `scissors`, scissors will be appended
|
||||
to `MERGE_MSG` before being passed on to the commit machinery in the
|
||||
case of a merge conflict.
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@ Functions
|
|||
|
||||
Whenever a submodule configuration is parsed in `parse_submodule_config_option`
|
||||
via e.g. `gitmodules_config()`, it will overwrite the null_sha1 entry.
|
||||
So in the normal case, when HEAD:.gitmodules is parsed first and then overlayed
|
||||
So in the normal case, when HEAD:.gitmodules is parsed first and then overlaid
|
||||
with the repository configuration, the null_sha1 entry contains the local
|
||||
configuration of a submodule (e.g. consolidated values from local git
|
||||
configuration and the .gitmodules file in the worktree).
|
||||
|
|
|
|||
|
|
@ -178,7 +178,7 @@ describe the simplified forms.
|
|||
|
||||
== Public API
|
||||
|
||||
All Trace2 API functions send a messsage to all of the active
|
||||
All Trace2 API functions send a message to all of the active
|
||||
Trace2 Targets. This section describes the set of available
|
||||
messages.
|
||||
|
||||
|
|
@ -377,7 +377,7 @@ of `pthread_create()`.
|
|||
and the thread elapsed time.
|
||||
+
|
||||
This function must be called by the thread-proc before it returns
|
||||
(so that the coorect TLS data is used and cleaned up. It should
|
||||
(so that the correct TLS data is used and cleaned up). It should
|
||||
not be called by the caller of `pthread_join()`.
|
||||
|
||||
=== Region and Data Messages
|
||||
|
|
@ -406,7 +406,7 @@ The `label` field is an arbitrary label used to describe the activity
|
|||
being started, such as "read_recursive" or "do_read_index".
|
||||
+
|
||||
The `repo` field, if set, will be used to get the "repo-id", so that
|
||||
recursive oerations can be attributed to the correct repository.
|
||||
recursive operations can be attributed to the correct repository.
|
||||
|
||||
`void trace2_region_leave(const char *category, const char *label, const struct repository *repo)`::
|
||||
|
||||
|
|
@ -421,7 +421,7 @@ This function pops the region nesting stack on the current thread
|
|||
and reports the elapsed time of the stack frame.
|
||||
+
|
||||
The `category`, `label`, and `repo` fields are the same as above.
|
||||
The `category` and `label` do not need to match the correpsonding
|
||||
The `category` and `label` do not need to match the corresponding
|
||||
"region_enter" message, but it makes the data stream easier to
|
||||
understand.
|
||||
|
||||
|
|
@ -816,7 +816,7 @@ with "?".
|
|||
Note that the session-id of the child process is not available to
|
||||
the current/spawning process, so the child's PID is reported here as
|
||||
a hint for post-processing. (But it is only a hint because the child
|
||||
proces may be a shell script which doesn't have a session-id.)
|
||||
process may be a shell script which doesn't have a session-id.)
|
||||
+
|
||||
Note that the `t_rel` field contains the observed run time in seconds
|
||||
for the child process (starting before the fork/exec/spawn and
|
||||
|
|
@ -1176,7 +1176,7 @@ d0 | main | atexit | | 0.028809 | |
|
|||
+
|
||||
Regions may be nested. This causes messages to be indented in the
|
||||
PERF target, for example.
|
||||
Elapsed times are relative to the start of the correpsonding nesting
|
||||
Elapsed times are relative to the start of the corresponding nesting
|
||||
level as expected. For example, if we add region message to:
|
||||
+
|
||||
----------------
|
||||
|
|
@ -1371,7 +1371,7 @@ d0 | main | atexit | | 0.030027 | |
|
|||
In this example, the preload region took 0.009122 seconds. The 7 threads
|
||||
took between 0.006069 and 0.008947 seconds to work on their portion of
|
||||
the index. Thread "th01" worked on 508 items at offset 0. Thread "th02"
|
||||
worked on 508 items at offset 2032. Thread "th04" worked on 508 itemts
|
||||
worked on 508 items at offset 2032. Thread "th04" worked on 508 items
|
||||
at offset 508.
|
||||
+
|
||||
This example also shows that thread names are assigned in a racy manner
|
||||
|
|
|
|||
|
|
@ -22,11 +22,11 @@ as "commit-graph" either in the .git/objects/info directory or in the info
|
|||
directory of an alternate.
|
||||
|
||||
The commit-graph file stores the commit graph structure along with some
|
||||
extra metadata to speed up graph walks. By listing commit OIDs in lexi-
|
||||
cographic order, we can identify an integer position for each commit and
|
||||
refer to the parents of a commit using those integer positions. We use
|
||||
binary search to find initial commits and then use the integer positions
|
||||
for fast lookups during the walk.
|
||||
extra metadata to speed up graph walks. By listing commit OIDs in
|
||||
lexicographic order, we can identify an integer position for each commit
|
||||
and refer to the parents of a commit using those integer positions. We
|
||||
use binary search to find initial commits and then use the integer
|
||||
positions for fast lookups during the walk.
|
||||
|
||||
A consumer may load the following info for a commit from the graph:
|
||||
|
||||
|
|
@ -85,7 +85,7 @@ have generation number represented by the macro GENERATION_NUMBER_ZERO = 0.
|
|||
Since the commit-graph file is closed under reachability, we can guarantee
|
||||
the following weaker condition on all commits:
|
||||
|
||||
If A and B are commits with generation numbers N amd M, respectively,
|
||||
If A and B are commits with generation numbers N and M, respectively,
|
||||
and N < M, then A cannot reach B.
|
||||
|
||||
Note how the strict inequality differs from the inequality when we have
|
||||
|
|
|
|||
|
|
@ -531,7 +531,7 @@ Until Git protocol gains SHA-256 support, using SHA-256 based storage
|
|||
on public-facing Git servers is strongly discouraged. Once Git
|
||||
protocol gains SHA-256 support, SHA-256 based servers are likely not
|
||||
to support SHA-1 compatibility, to avoid what may be a very expensive
|
||||
hash reencode during clone and to encourage peers to modernize.
|
||||
hash re-encode during clone and to encourage peers to modernize.
|
||||
|
||||
The design described here allows fetches by SHA-1 clients of a
|
||||
personal SHA-256 repository because it's not much more difficult than
|
||||
|
|
@ -602,7 +602,7 @@ git --output-format=sha1 log abac87a^{sha1}..f787cac^{sha256}
|
|||
|
||||
Choice of Hash
|
||||
--------------
|
||||
In early 2005, around the time that Git was written, Xiaoyun Wang,
|
||||
In early 2005, around the time that Git was written, Xiaoyun Wang,
|
||||
Yiqun Lisa Yin, and Hongbo Yu announced an attack finding SHA-1
|
||||
collisions in 2^69 operations. In August they published details.
|
||||
Luckily, no practical demonstrations of a collision in full SHA-1 were
|
||||
|
|
|
|||
|
|
@ -318,7 +318,7 @@ The remaining data of each directory block is grouped by type:
|
|||
== End of Index Entry
|
||||
|
||||
The End of Index Entry (EOIE) is used to locate the end of the variable
|
||||
length index entries and the begining of the extensions. Code can take
|
||||
length index entries and the beginning of the extensions. Code can take
|
||||
advantage of this to quickly locate the index extensions without having
|
||||
to parse through all of the index entries.
|
||||
|
||||
|
|
@ -351,7 +351,7 @@ The remaining data of each directory block is grouped by type:
|
|||
|
||||
- A number of index offset entries each consisting of:
|
||||
|
||||
- 32-bit offset from the begining of the file to the first cache entry
|
||||
- 32-bit offset from the beginning of the file to the first cache entry
|
||||
in this block of entries.
|
||||
|
||||
- 32-bit count of cache entries in this block
|
||||
|
|
|
|||
|
|
@ -644,7 +644,7 @@ update was successful, or 'ng [refname] [error]' if the update was not.
|
|||
command-ok = PKT-LINE("ok" SP refname)
|
||||
command-fail = PKT-LINE("ng" SP refname SP error-msg)
|
||||
|
||||
error-msg = 1*(OCTECT) ; where not "ok"
|
||||
error-msg = 1*(OCTET) ; where not "ok"
|
||||
----
|
||||
|
||||
Updates can be unsuccessful for a number of reasons. The reference can have
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ if/when needed.
|
|||
|
||||
A remote that can later provide the missing objects is called a
|
||||
promisor remote, as it promises to send the objects when
|
||||
requested. Initialy Git supported only one promisor remote, the origin
|
||||
requested. Initially Git supported only one promisor remote, the origin
|
||||
remote from which the user cloned and that was configured in the
|
||||
"extensions.partialClone" config option. Later support for more than
|
||||
one promisor remote has been implemented.
|
||||
|
|
|
|||
|
|
@ -252,7 +252,7 @@ A `fetch` request can take the following arguments:
|
|||
ofs-delta
|
||||
Indicate that the client understands PACKv2 with delta referring
|
||||
to its base by position in pack rather than by an oid. That is,
|
||||
they can read OBJ_OFS_DELTA (ake type 6) in a packfile.
|
||||
they can read OBJ_OFS_DELTA (aka type 6) in a packfile.
|
||||
|
||||
If the 'shallow' feature is advertised the following arguments can be
|
||||
included in the clients request as well as the potential addition of the
|
||||
|
|
|
|||
|
|
@ -117,7 +117,7 @@ early A became C or B, a late X became Y or Z". We can see there are
|
|||
4 combinations of ("B or C", "C or B") x ("X or Y", "Y or X").
|
||||
|
||||
By sorting, the conflict is given its canonical name, namely, "an
|
||||
early part became B or C, a late part becames X or Y", and whenever
|
||||
early part became B or C, a late part became X or Y", and whenever
|
||||
any of these four patterns appear, and we can get to the same conflict
|
||||
and resolution that we saw earlier.
|
||||
|
||||
|
|
|
|||
2
INSTALL
2
INSTALL
|
|
@ -109,7 +109,7 @@ Issues of note:
|
|||
|
||||
- Git is reasonably self-sufficient, but does depend on a few external
|
||||
programs and libraries. Git can be used without most of them by adding
|
||||
the approriate "NO_<LIBRARY>=YesPlease" to the make command line or
|
||||
the appropriate "NO_<LIBRARY>=YesPlease" to the make command line or
|
||||
config.mak file.
|
||||
|
||||
- "zlib", the compression library. Git won't build without it.
|
||||
|
|
|
|||
4
apply.c
4
apply.c
|
|
@ -4183,8 +4183,8 @@ static void show_rename_copy(struct patch *p)
|
|||
old_name = slash_old + 1;
|
||||
new_name = slash_new + 1;
|
||||
}
|
||||
/* p->old_name thru old_name is the common prefix, and old_name and new_name
|
||||
* through the end of names are renames
|
||||
/* p->old_name through old_name is the common prefix, and old_name and
|
||||
* new_name through the end of names are renames
|
||||
*/
|
||||
if (old_name != p->old_name)
|
||||
printf(" %s %.*s{%s => %s} (%d%%)\n", renamecopy,
|
||||
|
|
|
|||
|
|
@ -1403,7 +1403,7 @@ static int do_fetch(struct transport *transport,
|
|||
|
||||
/*
|
||||
* We're setting the upstream configuration for the
|
||||
* current branch. The relevent upstream is the
|
||||
* current branch. The relevant upstream is the
|
||||
* fetched branch that is meant to be merged with the
|
||||
* current one, i.e. the one fetched to FETCH_HEAD.
|
||||
*
|
||||
|
|
|
|||
|
|
@ -458,7 +458,7 @@ static const char *lock_repo_for_gc(int force, pid_t* ret_pid)
|
|||
/*
|
||||
* Returns 0 if there was no previous error and gc can proceed, 1 if
|
||||
* gc should not proceed due to an error in the last run. Prints a
|
||||
* message and returns -1 if an error occured while reading gc.log
|
||||
* message and returns -1 if an error occurred while reading gc.log
|
||||
*/
|
||||
static int report_last_gc_error(void)
|
||||
{
|
||||
|
|
@ -601,7 +601,7 @@ int cmd_gc(int argc, const char **argv, const char *prefix)
|
|||
if (detach_auto) {
|
||||
int ret = report_last_gc_error();
|
||||
if (ret < 0)
|
||||
/* an I/O error occured, already reported */
|
||||
/* an I/O error occurred, already reported */
|
||||
exit(128);
|
||||
if (ret == 1)
|
||||
/* Last gc --auto failed. Skip this one. */
|
||||
|
|
|
|||
|
|
@ -163,7 +163,7 @@ static void *get_delta(struct object_entry *entry)
|
|||
delta_buf = diff_delta(base_buf, base_size,
|
||||
buf, size, &delta_size, 0);
|
||||
/*
|
||||
* We succesfully computed this delta once but dropped it for
|
||||
* We successfully computed this delta once but dropped it for
|
||||
* memory reasons. Something is very wrong if this time we
|
||||
* recompute and create a different delta.
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -464,7 +464,7 @@ static void prepare_commit_graph_one(struct repository *r, const char *obj_dir)
|
|||
/*
|
||||
* Return 1 if commit_graph is non-NULL, and 0 otherwise.
|
||||
*
|
||||
* On the first invocation, this function attemps to load the commit
|
||||
* On the first invocation, this function attempts to load the commit
|
||||
* graph if the_repository is configured to have one.
|
||||
*/
|
||||
static int prepare_commit_graph(struct repository *r)
|
||||
|
|
|
|||
2
commit.h
2
commit.h
|
|
@ -132,7 +132,7 @@ const void *repo_get_commit_buffer(struct repository *r,
|
|||
#endif
|
||||
|
||||
/*
|
||||
* Tell the commit subsytem that we are done with a particular commit buffer.
|
||||
* Tell the commit subsystem that we are done with a particular commit buffer.
|
||||
* The commit and buffer should be the input and return value, respectively,
|
||||
* from an earlier call to get_commit_buffer. The buffer may or may not be
|
||||
* freed by this call; callers should not access the memory afterwards.
|
||||
|
|
|
|||
|
|
@ -558,7 +558,7 @@ int xwcstoutf(char *utf, const wchar_t *wcs, size_t utflen);
|
|||
|
||||
/*
|
||||
* A critical section used in the implementation of the spawn
|
||||
* functions (mingw_spawnv[p]e()) and waitpid(). Intialised in
|
||||
* functions (mingw_spawnv[p]e()) and waitpid(). Initialised in
|
||||
* the replacement main() macro below.
|
||||
*/
|
||||
extern CRITICAL_SECTION pinfo_cs;
|
||||
|
|
|
|||
|
|
@ -1564,7 +1564,7 @@ static FORCEINLINE void* win32direct_mmap(size_t size) {
|
|||
return (ptr != 0)? ptr: MFAIL;
|
||||
}
|
||||
|
||||
/* This function supports releasing coalesed segments */
|
||||
/* This function supports releasing coalesced segments */
|
||||
static FORCEINLINE int win32munmap(void* ptr, size_t size) {
|
||||
MEMORY_BASIC_INFORMATION minfo;
|
||||
char* cptr = (char*)ptr;
|
||||
|
|
@ -1655,7 +1655,7 @@ static FORCEINLINE int win32munmap(void* ptr, size_t size) {
|
|||
#define CALL_MREMAP(addr, osz, nsz, mv) MFAIL
|
||||
#endif /* HAVE_MMAP && HAVE_MREMAP */
|
||||
|
||||
/* mstate bit set if continguous morecore disabled or failed */
|
||||
/* mstate bit set if contiguous morecore disabled or failed */
|
||||
#define USE_NONCONTIGUOUS_BIT (4U)
|
||||
|
||||
/* segment bit set in create_mspace_with_base */
|
||||
|
|
@ -2485,7 +2485,7 @@ typedef struct malloc_segment* msegmentptr;
|
|||
|
||||
Trim support
|
||||
Fields holding the amount of unused topmost memory that should trigger
|
||||
timming, and a counter to force periodic scanning to release unused
|
||||
timing, and a counter to force periodic scanning to release unused
|
||||
non-topmost segments.
|
||||
|
||||
Locking
|
||||
|
|
|
|||
|
|
@ -79,7 +79,7 @@ change its address during its lifetime.
|
|||
When the chars burst over a chunk boundary, we allocate a larger
|
||||
chunk, and then copy the partly formed object from the end of the old
|
||||
chunk to the beginning of the new larger chunk. We then carry on
|
||||
accreting characters to the end of the object as we normally would.
|
||||
accrediting characters to the end of the object as we normally would.
|
||||
|
||||
A special macro is provided to add a single char at a time to a
|
||||
growing object. This allows the use of register variables, which
|
||||
|
|
|
|||
|
|
@ -3462,7 +3462,7 @@ build_equiv_class (bitset_t sbcset, const unsigned char *name)
|
|||
/* This isn't a valid character. */
|
||||
return REG_ECOLLATE;
|
||||
|
||||
/* Build single byte matcing table for this equivalence class. */
|
||||
/* Build single byte matching table for this equivalence class. */
|
||||
char_buf[1] = (unsigned char) '\0';
|
||||
len = weights[idx1 & 0xffffff];
|
||||
for (ch = 0; ch < SBC_MAX; ++ch)
|
||||
|
|
|
|||
|
|
@ -322,7 +322,7 @@ typedef enum
|
|||
/* POSIX regcomp return error codes. (In the order listed in the
|
||||
standard.) */
|
||||
REG_BADPAT, /* Invalid pattern. */
|
||||
REG_ECOLLATE, /* Inalid collating element. */
|
||||
REG_ECOLLATE, /* Invalid collating element. */
|
||||
REG_ECTYPE, /* Invalid character class name. */
|
||||
REG_EESCAPE, /* Trailing backslash. */
|
||||
REG_ESUBREG, /* Invalid back reference. */
|
||||
|
|
|
|||
|
|
@ -1616,7 +1616,7 @@ free_state (re_dfastate_t *state)
|
|||
re_free (state);
|
||||
}
|
||||
|
||||
/* Create the new state which is independ of contexts.
|
||||
/* Create the new state which is independent of contexts.
|
||||
Return the new state if succeeded, otherwise return NULL. */
|
||||
|
||||
static re_dfastate_t *
|
||||
|
|
|
|||
|
|
@ -2420,7 +2420,7 @@ find_recover_state (reg_errcode_t *err, re_match_context_t *mctx)
|
|||
/* From the node set CUR_NODES, pick up the nodes whose types are
|
||||
OP_OPEN_SUBEXP and which have corresponding back references in the regular
|
||||
expression. And register them to use them later for evaluating the
|
||||
correspoding back references. */
|
||||
corresponding back references. */
|
||||
|
||||
static reg_errcode_t
|
||||
internal_function
|
||||
|
|
@ -3347,7 +3347,7 @@ build_trtable (const re_dfa_t *dfa, re_dfastate_t *state)
|
|||
dests_node = dests_alloc->dests_node;
|
||||
dests_ch = dests_alloc->dests_ch;
|
||||
|
||||
/* Initialize transiton table. */
|
||||
/* Initialize transition table. */
|
||||
state->word_trtable = state->trtable = NULL;
|
||||
|
||||
/* At first, group all nodes belonging to `state' into several
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ REM and MAKE, we must blend these two different worlds. This script
|
|||
REM attempts to do that.
|
||||
REM ================================================================
|
||||
REM This BAT file starts in a plain (non-developer) command prompt,
|
||||
REM searches for the "best" commmand prompt setup script, installs
|
||||
REM searches for the "best" command prompt setup script, installs
|
||||
REM it into the current CMD process, and exports the various MSVC
|
||||
REM environment variables for use by MAKE.
|
||||
REM
|
||||
|
|
|
|||
|
|
@ -85,7 +85,7 @@ AC_DEFUN([GIT_PARSE_WITH],
|
|||
|
||||
# GIT_PARSE_WITH_SET_MAKE_VAR(WITHNAME, VAR, HELP_TEXT)
|
||||
# -----------------------------------------------------
|
||||
# Set VAR to the value specied by --with-WITHNAME.
|
||||
# Set VAR to the value specified by --with-WITHNAME.
|
||||
# No verification of arguments is performed, but warnings are issued
|
||||
# if either 'yes' or 'no' is specified.
|
||||
# HELP_TEXT is presented when --help is called.
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ expression s;
|
|||
+ set_commit_tree(c, s)
|
||||
...>}
|
||||
|
||||
// These excluded functions must access c->maybe_tree direcly.
|
||||
// These excluded functions must access c->maybe_tree directly.
|
||||
// Note that if c->maybe_tree is written somewhere outside of these
|
||||
// functions, then the recommended transformation will be bogus with
|
||||
// repo_get_commit_tree() on the LHS.
|
||||
|
|
|
|||
|
|
@ -550,7 +550,7 @@ __git_index_files ()
|
|||
esc_idx, 1)
|
||||
} else if (esc == "n") {
|
||||
# Uh-oh, a newline character.
|
||||
# We cant reliably put a pathname
|
||||
# We cannot reliably put a pathname
|
||||
# containing a newline into COMPREPLY,
|
||||
# and the newline would create a mess.
|
||||
# Skip this path.
|
||||
|
|
@ -565,7 +565,7 @@ __git_index_files ()
|
|||
}
|
||||
}
|
||||
# Drop closing double quote, if there is one.
|
||||
# (There isnt any if this is a directory, as it was
|
||||
# (There is not any if this is a directory, as it was
|
||||
# already stripped with the trailing path components.)
|
||||
if (substr(p, length(p), 1) == "\"")
|
||||
out = out substr(p, 1, length(p) - 1)
|
||||
|
|
|
|||
|
|
@ -95,7 +95,7 @@ if PYTHON3:
|
|||
unicode = str
|
||||
|
||||
def write_str(f, msg):
|
||||
# Try outputing with the default encoding. If it fails,
|
||||
# Try outputting with the default encoding. If it fails,
|
||||
# try UTF-8.
|
||||
try:
|
||||
f.buffer.write(msg.encode(sys.getdefaultencoding()))
|
||||
|
|
@ -2129,7 +2129,7 @@ class SMTPMailer(Mailer):
|
|||
# equivalent to
|
||||
# self.smtp.ehlo()
|
||||
# self.smtp.starttls()
|
||||
# with acces to the ssl layer
|
||||
# with access to the ssl layer
|
||||
self.smtp.ehlo()
|
||||
if not self.smtp.has_extn("starttls"):
|
||||
raise smtplib.SMTPException("STARTTLS extension not supported by server")
|
||||
|
|
@ -2148,7 +2148,7 @@ class SMTPMailer(Mailer):
|
|||
cert_reqs=ssl.CERT_NONE
|
||||
)
|
||||
self.environment.get_logger().error(
|
||||
'*** Warning, the server certificat is not verified (smtp) ***\n'
|
||||
'*** Warning, the server certificate is not verified (smtp) ***\n'
|
||||
'*** set the option smtpCACerts ***\n'
|
||||
)
|
||||
if not hasattr(self.smtp.sock, "read"):
|
||||
|
|
@ -3189,7 +3189,7 @@ class ProjectdescEnvironmentMixin(Environment):
|
|||
self.COMPUTED_KEYS += ['projectdesc']
|
||||
|
||||
def get_projectdesc(self):
|
||||
"""Return a one-line descripition of the project."""
|
||||
"""Return a one-line description of the project."""
|
||||
|
||||
git_dir = get_git_dir()
|
||||
try:
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@ config = git_multimail.Config('multimailhook')
|
|||
|
||||
# Set some Git configuration variables. Equivalent to passing var=val
|
||||
# to "git -c var=val" each time git is called, or to adding the
|
||||
# configuration in .git/config (must come before instanciating the
|
||||
# configuration in .git/config (must come before instantiating the
|
||||
# environment) :
|
||||
#git_multimail.Config.add_config_parameters('multimailhook.commitEmailFormat=html')
|
||||
#git_multimail.Config.add_config_parameters(('user.name=foo', 'user.email=foo@example.com'))
|
||||
|
|
|
|||
|
|
@ -329,7 +329,7 @@ generate_update_branch_email()
|
|||
#
|
||||
# git rev-parse --not --all | grep -v $(git rev-parse $refname)
|
||||
#
|
||||
# Get's us to something pretty safe (apart from the small time
|
||||
# Gets us to something pretty safe (apart from the small time
|
||||
# between refname being read, and git rev-parse running - for that,
|
||||
# I give up)
|
||||
#
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ opcode.
|
|||
Repository sections are matched on the basename of the repository
|
||||
(after removing the .git suffix).
|
||||
|
||||
The opcode abbrevations are:
|
||||
The opcode abbreviations are:
|
||||
|
||||
C: create new ref
|
||||
D: delete existing ref
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
# This rule states that each system call should have its return value checked
|
||||
# The problem is that it includes the print call. Checking every print call's
|
||||
# return value would be harmful to the code readabilty.
|
||||
# return value would be harmful to the code readability.
|
||||
# This configuration keeps all default function but print.
|
||||
[InputOutput::RequireCheckedSyscalls]
|
||||
functions = open say close
|
||||
|
|
|
|||
|
|
@ -79,7 +79,7 @@ chomp($export_media);
|
|||
$export_media = !($export_media eq 'false');
|
||||
|
||||
my $wiki_login = run_git("config --get remote.${remotename}.mwLogin");
|
||||
# Note: mwPassword is discourraged. Use the credential system instead.
|
||||
# Note: mwPassword is discouraged. Use the credential system instead.
|
||||
my $wiki_passwd = run_git("config --get remote.${remotename}.mwPassword");
|
||||
my $wiki_domain = run_git("config --get remote.${remotename}.mwDomain");
|
||||
chomp($wiki_login);
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ $url = 'http://localhost:'.$port.'/wiki/mw-config/index.php';
|
|||
$db_dir = urlencode($tmp);
|
||||
$tmp_cookie = tempnam($tmp, "COOKIE_");
|
||||
/*
|
||||
* Fetchs a page with cURL.
|
||||
* Fetches a page with cURL.
|
||||
*/
|
||||
function get($page_name = "") {
|
||||
$curl = curl_init();
|
||||
|
|
|
|||
|
|
@ -143,7 +143,7 @@ test_expect_success 'Git clone works with one specific page cloned ' '
|
|||
test_expect_success 'Git clone works with multiple specific page cloned ' '
|
||||
wiki_reset &&
|
||||
wiki_editpage foo "I will be there" false &&
|
||||
wiki_editpage bar "I will not disapear" false &&
|
||||
wiki_editpage bar "I will not disappear" false &&
|
||||
wiki_editpage namnam "I be erased" false &&
|
||||
wiki_editpage nyancat "nyan nyan nyan you will not erase me" false &&
|
||||
wiki_delete_page namnam &&
|
||||
|
|
|
|||
|
|
@ -279,7 +279,7 @@ start_lighttpd () {
|
|||
"$LIGHTTPD_DIR"/lighttpd -f "$WEB"/lighttpd.conf
|
||||
|
||||
if test $? -ne 0 ; then
|
||||
echo "Could not execute http deamon lighttpd"
|
||||
echo "Could not execute http daemon lighttpd"
|
||||
exit 1
|
||||
fi
|
||||
}
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@ if __name__ == "__main__":
|
|||
print("usage: %s dump URL -rLOWER:UPPER")
|
||||
sys.exit(1)
|
||||
if not sys.argv[1] == 'dump':
|
||||
raise NotImplementedError('only "dump" is suppported.')
|
||||
raise NotImplementedError('only "dump" is supported.')
|
||||
url = sys.argv[2]
|
||||
r = ('0', 'HEAD')
|
||||
if len(sys.argv) == 4 and sys.argv[3][0:2] == '-r':
|
||||
|
|
|
|||
|
|
@ -418,7 +418,7 @@ static int encode_to_git(const char *path, const char *src, size_t src_len,
|
|||
if (!dst) {
|
||||
/*
|
||||
* We could add the blob "as-is" to Git. However, on checkout
|
||||
* we would try to reencode to the original encoding. This
|
||||
* we would try to re-encode to the original encoding. This
|
||||
* would fail and we would leave the user with a messed-up
|
||||
* working tree. Let's try to avoid this by screaming loud.
|
||||
*/
|
||||
|
|
|
|||
4
daemon.c
4
daemon.c
|
|
@ -598,7 +598,7 @@ static void canonicalize_client(struct strbuf *out, const char *in)
|
|||
* Read the host as supplied by the client connection.
|
||||
*
|
||||
* Returns a pointer to the character after the NUL byte terminating the host
|
||||
* arguemnt, or 'extra_args' if there is no host arguemnt.
|
||||
* argument, or 'extra_args' if there is no host argument.
|
||||
*/
|
||||
static char *parse_host_arg(struct hostinfo *hi, char *extra_args, int buflen)
|
||||
{
|
||||
|
|
@ -652,7 +652,7 @@ static void parse_extra_args(struct hostinfo *hi, struct argv_array *env,
|
|||
* service that will be run.
|
||||
*
|
||||
* If there ends up being a particular arg in the future that
|
||||
* git-daemon needs to parse specificly (like the 'host' arg)
|
||||
* git-daemon needs to parse specifically (like the 'host' arg)
|
||||
* then it can be parsed here and not added to 'git_protocol'.
|
||||
*/
|
||||
if (*arg) {
|
||||
|
|
|
|||
4
diff.c
4
diff.c
|
|
@ -2551,7 +2551,7 @@ static int scale_linear(int it, int width, int max_change)
|
|||
/*
|
||||
* make sure that at least one '-' or '+' is printed if
|
||||
* there is any change to this path. The easiest way is to
|
||||
* scale linearly as if the alloted width is one column shorter
|
||||
* scale linearly as if the allotted width is one column shorter
|
||||
* than it is, and then add 1 to the result.
|
||||
*/
|
||||
return 1 + (it * (width - 1) / max_change);
|
||||
|
|
@ -3196,7 +3196,7 @@ static int is_conflict_marker(const char *line, int marker_size, unsigned long l
|
|||
for (cnt = 1; cnt < marker_size; cnt++)
|
||||
if (line[cnt] != firstchar)
|
||||
return 0;
|
||||
/* line[1] thru line[marker_size-1] are same as firstchar */
|
||||
/* line[1] through line[marker_size-1] are same as firstchar */
|
||||
if (len < marker_size + 1 || !isspace(line[marker_size]))
|
||||
return 0;
|
||||
return 1;
|
||||
|
|
|
|||
2
dir.c
2
dir.c
|
|
@ -2489,7 +2489,7 @@ static int remove_dir_recurse(struct strbuf *path, int flag, int *kept_up)
|
|||
* wanted anyway
|
||||
*/
|
||||
continue;
|
||||
/* fall thru */
|
||||
/* fall through */
|
||||
} else if (S_ISDIR(st.st_mode)) {
|
||||
if (!remove_dir_recurse(path, flag, &kept_down))
|
||||
continue; /* happy */
|
||||
|
|
|
|||
|
|
@ -600,7 +600,7 @@ my $cvs = CVSconn->new($opt_d, $cvs_tree);
|
|||
sub pdate($) {
|
||||
my ($d) = @_;
|
||||
m#(\d{2,4})/(\d\d)/(\d\d)\s(\d\d):(\d\d)(?::(\d\d))?#
|
||||
or die "Unparseable date: $d\n";
|
||||
or die "Unparsable date: $d\n";
|
||||
my $y=$1;
|
||||
$y+=100 if $y<70;
|
||||
$y+=1900 if $y<1000;
|
||||
|
|
|
|||
|
|
@ -1228,7 +1228,7 @@ sub process_address_list {
|
|||
# domain name that corresponds the IP address in the HELO/EHLO
|
||||
# handshake. This is used to verify the connection and prevent
|
||||
# spammers from trying to hide their identity. If the DNS and IP don't
|
||||
# match, the receiveing MTA may deny the connection.
|
||||
# match, the receiving MTA may deny the connection.
|
||||
#
|
||||
# Here is a deny example of Net::SMTP with the default "localhost.localdomain"
|
||||
#
|
||||
|
|
|
|||
|
|
@ -1657,15 +1657,15 @@ sub quot_cec {
|
|||
my $cntrl = shift;
|
||||
my %opts = @_;
|
||||
my %es = ( # character escape codes, aka escape sequences
|
||||
"\t" => '\t', # tab (HT)
|
||||
"\n" => '\n', # line feed (LF)
|
||||
"\r" => '\r', # carrige return (CR)
|
||||
"\f" => '\f', # form feed (FF)
|
||||
"\b" => '\b', # backspace (BS)
|
||||
"\a" => '\a', # alarm (bell) (BEL)
|
||||
"\e" => '\e', # escape (ESC)
|
||||
"\013" => '\v', # vertical tab (VT)
|
||||
"\000" => '\0', # nul character (NUL)
|
||||
"\t" => '\t', # tab (HT)
|
||||
"\n" => '\n', # line feed (LF)
|
||||
"\r" => '\r', # carriage return (CR)
|
||||
"\f" => '\f', # form feed (FF)
|
||||
"\b" => '\b', # backspace (BS)
|
||||
"\a" => '\a', # alarm (bell) (BEL)
|
||||
"\e" => '\e', # escape (ESC)
|
||||
"\013" => '\v', # vertical tab (VT)
|
||||
"\000" => '\0', # nul character (NUL)
|
||||
);
|
||||
my $chr = ( (exists $es{$cntrl})
|
||||
? $es{$cntrl}
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@ unsigned int memihash(const void *buf, size_t len)
|
|||
}
|
||||
|
||||
/*
|
||||
* Incoporate another chunk of data into a memihash
|
||||
* Incorporate another chunk of data into a memihash
|
||||
* computation.
|
||||
*/
|
||||
unsigned int memihash_cont(unsigned int hash_seed, const void *buf, size_t len)
|
||||
|
|
|
|||
|
|
@ -502,7 +502,7 @@ static inline void hashmap_disable_item_counting(struct hashmap *map)
|
|||
}
|
||||
|
||||
/*
|
||||
* Re-enable item couting when adding/removing items.
|
||||
* Re-enable item counting when adding/removing items.
|
||||
* If counting is currently disabled, it will force count them.
|
||||
* It WILL NOT automatically rehash them.
|
||||
*/
|
||||
|
|
|
|||
2
help.c
2
help.c
|
|
@ -34,7 +34,7 @@ static struct category_description main_categories[] = {
|
|||
{ CAT_foreignscminterface, N_("Interacting with Others") },
|
||||
{ CAT_plumbingmanipulators, N_("Low-level Commands / Manipulators") },
|
||||
{ CAT_plumbinginterrogators, N_("Low-level Commands / Interrogators") },
|
||||
{ CAT_synchingrepositories, N_("Low-level Commands / Synching Repositories") },
|
||||
{ CAT_synchingrepositories, N_("Low-level Commands / Syncing Repositories") },
|
||||
{ CAT_purehelpers, N_("Low-level Commands / Internal Helpers") },
|
||||
{ 0, NULL }
|
||||
};
|
||||
|
|
|
|||
|
|
@ -138,7 +138,7 @@ static int lazy_nr_dir_threads;
|
|||
|
||||
/*
|
||||
* Set a minimum number of cache_entries that we will handle per
|
||||
* thread and use that to decide how many threads to run (upto
|
||||
* thread and use that to decide how many threads to run (up to
|
||||
* the number on the system).
|
||||
*
|
||||
* For guidance setting the lower per-thread bound, see:
|
||||
|
|
|
|||
|
|
@ -623,7 +623,7 @@ static int show_gitcomp(const struct option *opts)
|
|||
* Scan and may produce a new option[] array, which should be used
|
||||
* instead of the original 'options'.
|
||||
*
|
||||
* Right now this is only used to preprocess and substitue
|
||||
* Right now this is only used to preprocess and substitute
|
||||
* OPTION_ALIAS.
|
||||
*/
|
||||
static struct option *preprocess_options(struct parse_opt_ctx_t *ctx,
|
||||
|
|
|
|||
|
|
@ -563,7 +563,7 @@ sub get_record {
|
|||
Query user C<PROMPT> and return answer from user.
|
||||
|
||||
Honours GIT_ASKPASS and SSH_ASKPASS environment variables for querying
|
||||
the user. If no *_ASKPASS variable is set or an error occoured,
|
||||
the user. If no *_ASKPASS variable is set or an error occurred,
|
||||
the terminal is tried as a fallback.
|
||||
If C<ISPASSWORD> is set and true, the terminal disables echo.
|
||||
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
#define RANGE_DIFF_CREATION_FACTOR_DEFAULT 60
|
||||
|
||||
/*
|
||||
* Compare series of commmits in RANGE1 and RANGE2, and emit to the
|
||||
* Compare series of commits in RANGE1 and RANGE2, and emit to the
|
||||
* standard output. NULL can be passed to DIFFOPT to use the built-in
|
||||
* default.
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -1790,7 +1790,7 @@ static struct cache_entry *create_from_disk(struct mem_pool *ce_mem_pool,
|
|||
const unsigned char *cp = (const unsigned char *)name;
|
||||
size_t strip_len, previous_len;
|
||||
|
||||
/* If we're at the begining of a block, ignore the previous name */
|
||||
/* If we're at the beginning of a block, ignore the previous name */
|
||||
strip_len = decode_varint(&cp);
|
||||
if (previous_ce) {
|
||||
previous_len = previous_ce->ce_namelen;
|
||||
|
|
|
|||
|
|
@ -262,7 +262,7 @@ int refs_rename_ref_available(struct ref_store *refs,
|
|||
* after calling ref_iterator_advance() again or calling
|
||||
* ref_iterator_abort(), you must make a copy. When the iteration has
|
||||
* been exhausted, ref_iterator_advance() releases any resources
|
||||
* assocated with the iteration, frees the ref_iterator object, and
|
||||
* associated with the iteration, frees the ref_iterator object, and
|
||||
* returns ITER_DONE. If you want to abort the iteration early, call
|
||||
* ref_iterator_abort(), which also frees the ref_iterator object and
|
||||
* any associated resources. If there was an internal error advancing
|
||||
|
|
|
|||
|
|
@ -200,9 +200,9 @@ int repo_submodule_init(struct repository *subrepo,
|
|||
|
||||
if (repo_init(subrepo, gitdir.buf, worktree.buf)) {
|
||||
/*
|
||||
* If initilization fails then it may be due to the submodule
|
||||
* If initialization fails then it may be due to the submodule
|
||||
* not being populated in the superproject's worktree. Instead
|
||||
* we can try to initilize the submodule by finding it's gitdir
|
||||
* we can try to initialize the submodule by finding it's gitdir
|
||||
* in the superproject's 'modules' directory. In this case the
|
||||
* submodule would not have a worktree.
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -172,7 +172,7 @@ void repo_clear(struct repository *repo);
|
|||
* be allocated if needed.
|
||||
*
|
||||
* Return the number of index entries in the populated index or a value less
|
||||
* than zero if an error occured. If the repository's index has already been
|
||||
* than zero if an error occurred. If the repository's index has already been
|
||||
* populated then the number of entries will simply be returned.
|
||||
*/
|
||||
int repo_read_index(struct repository *repo);
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue