зеркало из https://github.com/microsoft/git.git
Fix spelling errors in comments of testcases
Reported-by: Jens Schleusener <Jens.Schleusener@fossies.org> Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
15beaaa3d1
Коммит
7a40cf1553
|
@ -126,7 +126,7 @@ check_sub_test_lib_test () {
|
|||
|
||||
check_sub_test_lib_test_err () {
|
||||
name="$1" # stdin is the expected output from the test
|
||||
# expected error output is in descriptior 3
|
||||
# expected error output is in descriptor 3
|
||||
(
|
||||
cd "$name" &&
|
||||
sed -e 's/^> //' -e 's/Z$//' >expect.out &&
|
||||
|
|
|
@ -215,7 +215,7 @@ stats_ascii () {
|
|||
}
|
||||
|
||||
|
||||
# contruct the attr/ returned by git ls-files --eol
|
||||
# construct the attr/ returned by git ls-files --eol
|
||||
# Take none (=empty), one or two args
|
||||
# convert.c: eol=XX overrides text=auto
|
||||
attr_ascii () {
|
||||
|
|
|
@ -76,7 +76,7 @@ EOF
|
|||
'
|
||||
|
||||
test_expect_success 'progress display breaks long lines #2' '
|
||||
# Note: we dont need that many spaces after the title to cover up
|
||||
# Note: we do not need that many spaces after the title to cover up
|
||||
# the last line before breaking the progress line.
|
||||
sed -e "s/Z$//" >expect <<\EOF &&
|
||||
Working hard.......2.........3.........4.........5.........6: 0% (1/100000)<CR>
|
||||
|
@ -104,7 +104,7 @@ EOF
|
|||
'
|
||||
|
||||
test_expect_success 'progress display breaks long lines #3 - even the first is too long' '
|
||||
# Note: we dont actually need any spaces at the end of the title
|
||||
# Note: we do not actually need any spaces at the end of the title
|
||||
# line, because there is no previous progress line to cover up.
|
||||
sed -e "s/Z$//" >expect <<\EOF &&
|
||||
Working hard.......2.........3.........4.........5.........6: Z
|
||||
|
|
|
@ -339,7 +339,7 @@ test_expect_success C_LOCALE_OUTPUT 'ambiguity hints' '
|
|||
test_expect_success C_LOCALE_OUTPUT 'ambiguity hints respect type' '
|
||||
test_must_fail git rev-parse 000000000^{commit} 2>stderr &&
|
||||
grep ^hint: stderr >hints &&
|
||||
# 5 commits, 1 tag (which is a commitish), plus intro line
|
||||
# 5 commits, 1 tag (which is a committish), plus intro line
|
||||
test_line_count = 7 hints
|
||||
'
|
||||
|
||||
|
|
|
@ -211,7 +211,7 @@ dissimilarity index 82%
|
|||
-
|
||||
- /* If this is an exact directory match, we may have
|
||||
- * directory files following this path. Match on them.
|
||||
- * Otherwise, we're at a pach subcomponent, and we need
|
||||
- * Otherwise, we're at a patch subcomponent, and we need
|
||||
- * to try to match again.
|
||||
- */
|
||||
- if (mtype == 0)
|
||||
|
|
|
@ -335,7 +335,7 @@ diff a/ls-tree.c b/ls-tree.c
|
|||
|
||||
- /* If this is an exact directory match, we may have
|
||||
- * directory files following this path. Match on them.
|
||||
- * Otherwise, we're at a pach subcomponent, and we need
|
||||
- * Otherwise, we're at a patch subcomponent, and we need
|
||||
- * to try to match again.
|
||||
+ if (e->directory) {
|
||||
+ /* If this is a directory, we have the following cases:
|
||||
|
|
|
@ -36,7 +36,7 @@ count_expand ()
|
|||
esac
|
||||
|
||||
# Prefix the output with the command line arguments, and
|
||||
# replace SP with a dot both in the expecte and actual output
|
||||
# replace SP with a dot both in the expected and actual output
|
||||
# so that test_cmp would show the difference together with the
|
||||
# breakage in a way easier to consume by the debugging user.
|
||||
{
|
||||
|
|
|
@ -163,7 +163,7 @@ test_pushdefault_workflow success current master
|
|||
# update parent1's foo (which is our upstream)
|
||||
test_pushdefault_workflow success upstream foo
|
||||
|
||||
# upsream is foo which is not the name of the current branch
|
||||
# upstream is foo which is not the name of the current branch
|
||||
test_pushdefault_workflow failure simple master
|
||||
|
||||
# master and foo are updated
|
||||
|
|
|
@ -682,9 +682,9 @@ test_expect_success 'push with http:// and a config of v2 does not request v2' '
|
|||
git -C "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" log -1 --format=%s client_branch >expect &&
|
||||
test_cmp expect actual &&
|
||||
|
||||
# Client didnt request to use protocol v2
|
||||
# Client did not request to use protocol v2
|
||||
! grep "Git-Protocol: version=2" log &&
|
||||
# Server didnt respond using protocol v2
|
||||
# Server did not respond using protocol v2
|
||||
! grep "git< version 2" log
|
||||
'
|
||||
|
||||
|
|
|
@ -744,7 +744,7 @@ test_expect_success '3b-check: Avoid implicit rename if involved as source on cu
|
|||
#
|
||||
# What if we were to attempt to do directory rename detection when someone
|
||||
# "mostly" moved a directory but still left some files around, or,
|
||||
# equivalently, fully renamed a directory in one commmit and then recreated
|
||||
# equivalently, fully renamed a directory in one commit and then recreated
|
||||
# that directory in a later commit adding some new files and then tried to
|
||||
# merge?
|
||||
#
|
||||
|
@ -941,7 +941,7 @@ test_expect_success '5a-check: Merge directories, other side adds files to origi
|
|||
# Commit B: z/{b,c,d_1,e}, y/d_3
|
||||
# Expected: y/{b,c,e}, CONFLICT(add/add: y/d_2 vs. y/d_3)
|
||||
# NOTE: If z/d_1 in commit B were to be involved in dir rename detection, as
|
||||
# we normaly would since z/ is being renamed to y/, then this would be
|
||||
# we normally would since z/ is being renamed to y/, then this would be
|
||||
# a rename/delete (z/d_1 -> y/d_1 vs. deleted) AND an add/add/add
|
||||
# conflict of y/d_1 vs. y/d_2 vs. y/d_3. Add/add/add is not
|
||||
# representable in the index, so the existence of y/d_3 needs to
|
||||
|
@ -2089,7 +2089,7 @@ test_expect_success '8b-check: Dual-directory rename, one into the others way, w
|
|||
#
|
||||
# Note: It could easily be argued that the correct resolution here is
|
||||
# y/{b,c,e}, CONFLICT(rename/delete: z/d -> y/d vs deleted)
|
||||
# and that the modifed version of d should be present in y/ after
|
||||
# and that the modified version of d should be present in y/ after
|
||||
# the merge, just marked as conflicted. Indeed, I previously did
|
||||
# argue that. But applying directory renames to the side of
|
||||
# history where a file is merely modified results in spurious
|
||||
|
|
|
@ -294,7 +294,7 @@ do
|
|||
done
|
||||
done
|
||||
|
||||
# test that splitting the index dosn't interfere
|
||||
# test that splitting the index doesn't interfere
|
||||
test_expect_success 'splitting the index results in the same state' '
|
||||
write_integration_script &&
|
||||
dirty_repo &&
|
||||
|
|
|
@ -541,7 +541,7 @@ test_expect_success 'tree_tag' '
|
|||
|
||||
# NEEDSWORK: not just check return status, but validate the output
|
||||
# Note that these tests DO NOTHING other than print a warning that
|
||||
# they are ommitting the one tag we asked them to export (because the
|
||||
# they are omitting the one tag we asked them to export (because the
|
||||
# tags resolve to a tree). They exist just to make sure we do not
|
||||
# abort but instead just warn.
|
||||
test_expect_success 'tree_tag-obj' 'git fast-export tree_tag-obj'
|
||||
|
|
|
@ -407,7 +407,7 @@ test_expect_success 'reinit depot' '
|
|||
'
|
||||
|
||||
#
|
||||
# What happens when two files of the same name are overlayed together?
|
||||
# What happens when two files of the same name are overlaid together?
|
||||
# The last-listed file should take preference.
|
||||
#
|
||||
# //depot
|
||||
|
|
|
@ -1257,7 +1257,7 @@ test_path_completion ()
|
|||
# In the following tests calling this function we only
|
||||
# care about how __git_complete_index_file() deals with
|
||||
# unusual characters in path names. By requesting only
|
||||
# untracked files we dont have to bother adding any
|
||||
# untracked files we do not have to bother adding any
|
||||
# paths to the index in those tests.
|
||||
__git_complete_index_file --others &&
|
||||
print_comp
|
||||
|
|
Загрузка…
Ссылка в новой задаче