+1 -1

t/t0000-basic.sh

··· 126 127 check_sub_test_lib_test_err () { 128 name="$1" # stdin is the expected output from the test 129 - # expected error output is in descriptior 3 130 ( 131 cd "$name" && 132 sed -e 's/^> //' -e 's/Z$//' >expect.out &&

··· 126 127 check_sub_test_lib_test_err () { 128 name="$1" # stdin is the expected output from the test 129 + # expected error output is in descriptor 3 130 ( 131 cd "$name" && 132 sed -e 's/^> //' -e 's/Z$//' >expect.out &&

+1 -1

t/t0027-auto-crlf.sh

··· 215 } 216 217 218 - # contruct the attr/ returned by git ls-files --eol 219 # Take none (=empty), one or two args 220 # convert.c: eol=XX overrides text=auto 221 attr_ascii () {

··· 215 } 216 217 218 + # construct the attr/ returned by git ls-files --eol 219 # Take none (=empty), one or two args 220 # convert.c: eol=XX overrides text=auto 221 attr_ascii () {

+2 -2

t/t0500-progress-display.sh

··· 76 ' 77 78 test_expect_success 'progress display breaks long lines #2' ' 79 - # Note: we dont need that many spaces after the title to cover up 80 # the last line before breaking the progress line. 81 sed -e "s/Z$//" >expect <<\EOF && 82 Working hard.......2.........3.........4.........5.........6: 0% (1/100000)<CR> ··· 104 ' 105 106 test_expect_success 'progress display breaks long lines #3 - even the first is too long' ' 107 - # Note: we dont actually need any spaces at the end of the title 108 # line, because there is no previous progress line to cover up. 109 sed -e "s/Z$//" >expect <<\EOF && 110 Working hard.......2.........3.........4.........5.........6: Z

··· 76 ' 77 78 test_expect_success 'progress display breaks long lines #2' ' 79 + # Note: we do not need that many spaces after the title to cover up 80 # the last line before breaking the progress line. 81 sed -e "s/Z$//" >expect <<\EOF && 82 Working hard.......2.........3.........4.........5.........6: 0% (1/100000)<CR> ··· 104 ' 105 106 test_expect_success 'progress display breaks long lines #3 - even the first is too long' ' 107 + # Note: we do not actually need any spaces at the end of the title 108 # line, because there is no previous progress line to cover up. 109 sed -e "s/Z$//" >expect <<\EOF && 110 Working hard.......2.........3.........4.........5.........6: Z

+1 -1

t/t1512-rev-parse-disambiguation.sh

··· 339 test_expect_success C_LOCALE_OUTPUT 'ambiguity hints respect type' ' 340 test_must_fail git rev-parse 000000000^{commit} 2>stderr && 341 grep ^hint: stderr >hints && 342 - # 5 commits, 1 tag (which is a commitish), plus intro line 343 test_line_count = 7 hints 344 ' 345

··· 339 test_expect_success C_LOCALE_OUTPUT 'ambiguity hints respect type' ' 340 test_must_fail git rev-parse 000000000^{commit} 2>stderr && 341 grep ^hint: stderr >hints && 342 + # 5 commits, 1 tag (which is a committish), plus intro line 343 test_line_count = 7 hints 344 ' 345

+1 -1

t/t4100/t-apply-3.patch

··· 211 - 212 - /* If this is an exact directory match, we may have 213 - * directory files following this path. Match on them. 214 - - * Otherwise, we're at a pach subcomponent, and we need 215 - * to try to match again. 216 - */ 217 - if (mtype == 0)

··· 211 - 212 - /* If this is an exact directory match, we may have 213 - * directory files following this path. Match on them. 214 + - * Otherwise, we're at a patch subcomponent, and we need 215 - * to try to match again. 216 - */ 217 - if (mtype == 0)

+1 -1

t/t4100/t-apply-7.patch

··· 335 336 - /* If this is an exact directory match, we may have 337 - * directory files following this path. Match on them. 338 - - * Otherwise, we're at a pach subcomponent, and we need 339 - * to try to match again. 340 + if (e->directory) { 341 + /* If this is a directory, we have the following cases:

··· 335 336 - /* If this is an exact directory match, we may have 337 - * directory files following this path. Match on them. 338 + - * Otherwise, we're at a patch subcomponent, and we need 339 - * to try to match again. 340 + if (e->directory) { 341 + /* If this is a directory, we have the following cases:

+1 -1

t/t4213-log-tabexpand.sh

··· 36 esac 37 38 # Prefix the output with the command line arguments, and 39 - # replace SP with a dot both in the expecte and actual output 40 # so that test_cmp would show the difference together with the 41 # breakage in a way easier to consume by the debugging user. 42 {

··· 36 esac 37 38 # Prefix the output with the command line arguments, and 39 + # replace SP with a dot both in the expected and actual output 40 # so that test_cmp would show the difference together with the 41 # breakage in a way easier to consume by the debugging user. 42 {

+1 -1

t/t5528-push-default.sh

··· 163 # update parent1's foo (which is our upstream) 164 test_pushdefault_workflow success upstream foo 165 166 - # upsream is foo which is not the name of the current branch 167 test_pushdefault_workflow failure simple master 168 169 # master and foo are updated

··· 163 # update parent1's foo (which is our upstream) 164 test_pushdefault_workflow success upstream foo 165 166 + # upstream is foo which is not the name of the current branch 167 test_pushdefault_workflow failure simple master 168 169 # master and foo are updated

+2 -2

t/t5702-protocol-v2.sh

··· 682 git -C "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" log -1 --format=%s client_branch >expect && 683 test_cmp expect actual && 684 685 - # Client didnt request to use protocol v2 686 ! grep "Git-Protocol: version=2" log && 687 - # Server didnt respond using protocol v2 688 ! grep "git< version 2" log 689 ' 690

··· 682 git -C "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" log -1 --format=%s client_branch >expect && 683 test_cmp expect actual && 684 685 + # Client did not request to use protocol v2 686 ! grep "Git-Protocol: version=2" log && 687 + # Server did not respond using protocol v2 688 ! grep "git< version 2" log 689 ' 690

+3 -3

t/t6043-merge-rename-directories.sh

··· 744 # 745 # What if we were to attempt to do directory rename detection when someone 746 # "mostly" moved a directory but still left some files around, or, 747 - # equivalently, fully renamed a directory in one commmit and then recreated 748 # that directory in a later commit adding some new files and then tried to 749 # merge? 750 # ··· 941 # Commit B: z/{b,c,d_1,e}, y/d_3 942 # Expected: y/{b,c,e}, CONFLICT(add/add: y/d_2 vs. y/d_3) 943 # NOTE: If z/d_1 in commit B were to be involved in dir rename detection, as 944 - # we normaly would since z/ is being renamed to y/, then this would be 945 # a rename/delete (z/d_1 -> y/d_1 vs. deleted) AND an add/add/add 946 # conflict of y/d_1 vs. y/d_2 vs. y/d_3. Add/add/add is not 947 # representable in the index, so the existence of y/d_3 needs to ··· 2089 # 2090 # Note: It could easily be argued that the correct resolution here is 2091 # y/{b,c,e}, CONFLICT(rename/delete: z/d -> y/d vs deleted) 2092 - # and that the modifed version of d should be present in y/ after 2093 # the merge, just marked as conflicted. Indeed, I previously did 2094 # argue that. But applying directory renames to the side of 2095 # history where a file is merely modified results in spurious

··· 744 # 745 # What if we were to attempt to do directory rename detection when someone 746 # "mostly" moved a directory but still left some files around, or, 747 + # equivalently, fully renamed a directory in one commit and then recreated 748 # that directory in a later commit adding some new files and then tried to 749 # merge? 750 # ··· 941 # Commit B: z/{b,c,d_1,e}, y/d_3 942 # Expected: y/{b,c,e}, CONFLICT(add/add: y/d_2 vs. y/d_3) 943 # NOTE: If z/d_1 in commit B were to be involved in dir rename detection, as 944 + # we normally would since z/ is being renamed to y/, then this would be 945 # a rename/delete (z/d_1 -> y/d_1 vs. deleted) AND an add/add/add 946 # conflict of y/d_1 vs. y/d_2 vs. y/d_3. Add/add/add is not 947 # representable in the index, so the existence of y/d_3 needs to ··· 2089 # 2090 # Note: It could easily be argued that the correct resolution here is 2091 # y/{b,c,e}, CONFLICT(rename/delete: z/d -> y/d vs deleted) 2092 + # and that the modified version of d should be present in y/ after 2093 # the merge, just marked as conflicted. Indeed, I previously did 2094 # argue that. But applying directory renames to the side of 2095 # history where a file is merely modified results in spurious

+1 -1

t/t7519-status-fsmonitor.sh

··· 294 done 295 done 296 297 - # test that splitting the index dosn't interfere 298 test_expect_success 'splitting the index results in the same state' ' 299 write_integration_script && 300 dirty_repo &&

··· 294 done 295 done 296 297 + # test that splitting the index doesn't interfere 298 test_expect_success 'splitting the index results in the same state' ' 299 write_integration_script && 300 dirty_repo &&

+1 -1

t/t9350-fast-export.sh

··· 541 542 # NEEDSWORK: not just check return status, but validate the output 543 # Note that these tests DO NOTHING other than print a warning that 544 - # they are ommitting the one tag we asked them to export (because the 545 # tags resolve to a tree). They exist just to make sure we do not 546 # abort but instead just warn. 547 test_expect_success 'tree_tag-obj' 'git fast-export tree_tag-obj'

··· 541 542 # NEEDSWORK: not just check return status, but validate the output 543 # Note that these tests DO NOTHING other than print a warning that 544 + # they are omitting the one tag we asked them to export (because the 545 # tags resolve to a tree). They exist just to make sure we do not 546 # abort but instead just warn. 547 test_expect_success 'tree_tag-obj' 'git fast-export tree_tag-obj'

+1 -1

t/t9809-git-p4-client-view.sh

··· 407 ' 408 409 # 410 - # What happens when two files of the same name are overlayed together? 411 # The last-listed file should take preference. 412 # 413 # //depot

··· 407 ' 408 409 # 410 + # What happens when two files of the same name are overlaid together? 411 # The last-listed file should take preference. 412 # 413 # //depot

+1 -1

t/t9902-completion.sh

··· 1257 # In the following tests calling this function we only 1258 # care about how __git_complete_index_file() deals with 1259 # unusual characters in path names. By requesting only 1260 - # untracked files we dont have to bother adding any 1261 # paths to the index in those tests. 1262 __git_complete_index_file --others && 1263 print_comp

··· 1257 # In the following tests calling this function we only 1258 # care about how __git_complete_index_file() deals with 1259 # unusual characters in path names. By requesting only 1260 + # untracked files we do not have to bother adding any 1261 # paths to the index in those tests. 1262 __git_complete_index_file --others && 1263 print_comp