+1 -1

t/t3903-stash.sh

··· 41 41 echo 4 > other-file && 42 42 git add other-file && 43 43 echo 5 > other-file && 44 44 - test_must_fail git stash apply 44 44 + test_must_fail git stash apply 45 45 ' 46 46 47 47 test_expect_success 'apply stashed changes' '

+3 -3

t/t4014-format-patch.sh

··· 98 98 sed -e "/^$/q" patch2 > hdrs2 && 99 99 grep "^To: R. E. Cipient <rcipient@example.com>$" hdrs2 && 100 100 grep "^Cc: S. E. Cipient <scipient@example.com>$" hdrs2 101 101 - 101 101 + 102 102 ' 103 103 104 104 test_expect_success 'extra headers without newlines' ' ··· 109 109 sed -e "/^$/q" patch3 > hdrs3 && 110 110 grep "^To: R. E. Cipient <rcipient@example.com>$" hdrs3 && 111 111 grep "^Cc: S. E. Cipient <scipient@example.com>$" hdrs3 112 112 - 112 112 + 113 113 ' 114 114 115 115 test_expect_success 'extra headers with multiple To:s' ' ··· 170 170 git checkout side && 171 171 git format-patch --cover-letter --thread -o patches/ master && 172 172 FIRST_MID=$(grep "Message-Id:" patches/0000-* | sed "s/^[^<]*\(<[^>]*>\).*$/\1/") && 173 173 - for i in patches/0001-* patches/0002-* patches/0003-* 173 173 + for i in patches/0001-* patches/0002-* patches/0003-* 174 174 do 175 175 grep "References: $FIRST_MID" $i && 176 176 grep "In-Reply-To: $FIRST_MID" $i || break

+1 -1

t/t4150-am.sh

··· 110 110 111 111 GIT_AUTHOR_NAME="Another Thor" 112 112 GIT_AUTHOR_EMAIL="a.thor@example.com" 113 113 - GIT_COMMITTER_NAME="Co M Miter" 113 113 + GIT_COMMITTER_NAME="Co M Miter" 114 114 GIT_COMMITTER_EMAIL="c.miter@example.com" 115 115 export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL 116 116

+1 -1

t/t5540-http-push.sh

··· 38 38 cd - && 39 39 mv test_repo.git $HTTPD_DOCUMENT_ROOT_PATH 40 40 ' 41 41 - 41 41 + 42 42 test_expect_success 'clone remote repository' ' 43 43 cd "$ROOT_PATH" && 44 44 git clone $HTTPD_URL/test_repo.git test_repo_clone