mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
Merge branch 'ar/typofix'
Typofixes. * ar/typofix: *: fix typos which duplicate a word
This commit is contained in:
commit
a515f26eac
|
@ -50,7 +50,7 @@ Fixes since v1.6.0.2
|
|||
if the working tree is currently dirty.
|
||||
|
||||
* "git for-each-ref --format=%(subject)" fixed for commits with no
|
||||
no newline in the message body.
|
||||
newline in the message body.
|
||||
|
||||
* "git remote" fixed to protect printf from user input.
|
||||
|
||||
|
|
|
@ -365,7 +365,7 @@ details).
|
|||
(merge 2fbd4f9 mh/maint-lockfile-overflow later to maint).
|
||||
|
||||
* Invocations of "git checkout" used internally by "git rebase" were
|
||||
counted as "checkout", and affected later "git checkout -" to the
|
||||
counted as "checkout", and affected later "git checkout -", which took
|
||||
the user to an unexpected place.
|
||||
(merge 3bed291 rr/rebase-checkout-reflog later to maint).
|
||||
|
||||
|
|
|
@ -184,8 +184,8 @@ Performance, Internal Implementation, Development Support etc.
|
|||
the ref backend in use, as its format is much richer than the
|
||||
normal refs, and written directly by "git fetch" as a plain file..
|
||||
|
||||
* An unused binary has been discarded, and and a bunch of commands
|
||||
have been turned into into built-in.
|
||||
* An unused binary has been discarded, and a bunch of commands
|
||||
have been turned into built-in.
|
||||
|
||||
* A handful of places in in-tree code still relied on being able to
|
||||
execute the git subcommands, especially built-ins, in "git-foo"
|
||||
|
|
|
@ -377,7 +377,7 @@ notes for details).
|
|||
on that order.
|
||||
|
||||
* "git show 'HEAD:Foo[BAR]Baz'" did not interpret the argument as a
|
||||
rev, i.e. the object named by the the pathname with wildcard
|
||||
rev, i.e. the object named by the pathname with wildcard
|
||||
characters in a tree object.
|
||||
(merge aac4fac nd/dwim-wildcards-as-pathspecs later to maint).
|
||||
|
||||
|
|
|
@ -599,7 +599,7 @@ supports four different modes of operation:
|
|||
convert any object names written to output to SHA-1, but store
|
||||
objects using SHA-256. This allows users to test the code with no
|
||||
visible behavior change except for performance. This allows
|
||||
allows running even tests that assume the SHA-1 hash function, to
|
||||
running even tests that assume the SHA-1 hash function, to
|
||||
sanity-check the behavior of the new mode.
|
||||
|
||||
2. ("early transition") Allow both SHA-1 and SHA-256 object names in
|
||||
|
|
|
@ -540,7 +540,7 @@ An `object-info` request takes the following arguments:
|
|||
Indicates to the server an object which the client wants to obtain
|
||||
information for.
|
||||
|
||||
The response of `object-info` is a list of the the requested object ids
|
||||
The response of `object-info` is a list of the requested object ids
|
||||
and associated requested information, each separated by a single space.
|
||||
|
||||
output = info flush-pkt
|
||||
|
|
2
attr.c
2
attr.c
|
@ -685,7 +685,7 @@ static struct attr_stack *read_attr_from_array(const char **list)
|
|||
* Callers into the attribute system assume there is a single, system-wide
|
||||
* global state where attributes are read from and when the state is flipped by
|
||||
* calling git_attr_set_direction(), the stack frames that have been
|
||||
* constructed need to be discarded so so that subsequent calls into the
|
||||
* constructed need to be discarded so that subsequent calls into the
|
||||
* attribute system will lazily read from the right place. Since changing
|
||||
* direction causes a global paradigm shift, it should not ever be called while
|
||||
* another thread could potentially be calling into the attribute system.
|
||||
|
|
|
@ -1968,8 +1968,7 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
|
|||
} else if (rev.diffopt.close_file) {
|
||||
/*
|
||||
* The diff code parsed --output; it has already opened the
|
||||
* file, but but we must instruct it not to close after each
|
||||
* diff.
|
||||
* file, but we must instruct it not to close after each diff.
|
||||
*/
|
||||
rev.diffopt.no_free = 1;
|
||||
} else {
|
||||
|
|
|
@ -1366,7 +1366,7 @@ static inline void *container_of_or_null_offset(void *ptr, size_t offset)
|
|||
(type *)container_of_or_null_offset(ptr, offsetof(type, member))
|
||||
|
||||
/*
|
||||
* like offsetof(), but takes a pointer to a a variable of type which
|
||||
* like offsetof(), but takes a pointer to a variable of type which
|
||||
* contains @member, instead of a specified type.
|
||||
* @ptr is subject to multiple evaluation since we can't rely on __typeof__
|
||||
* everywhere.
|
||||
|
|
|
@ -2149,7 +2149,7 @@ sub req_diff
|
|||
( $meta2->{revision} or "workingcopy" ));
|
||||
|
||||
# TODO: Use --label instead of -L because -L is no longer
|
||||
# documented and may go away someday. Not sure if there there are
|
||||
# documented and may go away someday. Not sure if there are
|
||||
# versions that only support -L, which would make this change risky?
|
||||
# http://osdir.com/ml/bug-gnu-utils-gnu/2010-12/msg00060.html
|
||||
# ("man diff" should actually document the best migration strategy,
|
||||
|
|
|
@ -2152,7 +2152,7 @@ static char *handle_path_level_conflicts(struct merge_options *opt,
|
|||
* implicit renaming of files that should be left in place. (See
|
||||
* testcase 6b in t6043 for details.)
|
||||
* 2. Prune directory renames if there are still files left in the
|
||||
* the original directory. These represent a partial directory rename,
|
||||
* original directory. These represent a partial directory rename,
|
||||
* i.e. a rename where only some of the files within the directory
|
||||
* were renamed elsewhere. (Technically, this could be done earlier
|
||||
* in get_directory_renames(), except that would prevent us from
|
||||
|
|
2
remote.c
2
remote.c
|
@ -1592,7 +1592,7 @@ void set_ref_status_for_push(struct ref *remote_refs, int send_mirror,
|
|||
else
|
||||
/*
|
||||
* If the ref isn't stale, and is reachable
|
||||
* from from one of the reflog entries of
|
||||
* from one of the reflog entries of
|
||||
* the local branch, force the update.
|
||||
*/
|
||||
force_ref_update = 1;
|
||||
|
|
|
@ -182,7 +182,7 @@ test_expect_success 'rename errors out early when deleting non-existent branch'
|
|||
)
|
||||
'
|
||||
|
||||
test_expect_success 'rename errors out early when when new name is invalid' '
|
||||
test_expect_success 'rename errors out early when new name is invalid' '
|
||||
test_config remote.foo.vcs bar &&
|
||||
echo "fatal: '\''invalid...name'\'' is not a valid remote name" >expect &&
|
||||
test_must_fail git remote rename foo invalid...name 2>actual &&
|
||||
|
|
|
@ -322,7 +322,7 @@ test_expect_success 'git-svn works in a bare repository' '
|
|||
git svn fetch ) &&
|
||||
rm -rf bare-repo
|
||||
'
|
||||
test_expect_success 'git-svn works in in a repository with a gitdir: link' '
|
||||
test_expect_success 'git-svn works in a repository with a gitdir: link' '
|
||||
mkdir worktree gitdir &&
|
||||
( cd worktree &&
|
||||
git svn init "$svnrepo" &&
|
||||
|
|
Loading…
Reference in a new issue