X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=t%2Ft5150-request-pull.sh;h=169d3ea376f68a0924920b52748ba64356084eab;hb=44e08b003d37440fba6589c07a9573df9d28e6f5;hp=8e0425b7ac9f5949c706dedf47b25bdf2ee26fdd;hpb=ea0edad58f58378cb42c2895c5578524bbaba296;p=git.git diff --git a/t/t5150-request-pull.sh b/t/t5150-request-pull.sh old mode 100644 new mode 100755 index 8e0425b7a..169d3ea37 --- a/t/t5150-request-pull.sh +++ b/t/t5150-request-pull.sh @@ -69,8 +69,7 @@ test_expect_success 'setup: two scripts for reading pull requests' ' #!/bin/sed -nf / in the git repository at:$/! d n - /^$/! q - n + /^$/ n s/^[ ]*\(.*\) \([^ ]*\)/please pull\ \1\ \2/p @@ -81,7 +80,9 @@ test_expect_success 'setup: two scripts for reading pull requests' ' #!/bin/sed -nf s/$_x40/OBJECT_NAME/g s/A U Thor/AUTHOR/g + s/[-0-9]\{10\} [:0-9]\{8\} [-+][0-9]\{4\}/DATE/g s/ [^ ].*/ SUBJECT/g + s/ [^ ].* (DATE)/ SUBJECT (DATE)/g s/$downstream_url_for_sed/URL/g s/for-upstream/BRANCH/g s/mnemonic.txt/FILENAME/g @@ -188,11 +189,10 @@ test_expect_success 'pull request format' ' git init --bare downstream.git && cat <<-\EOT >expect && The following changes since commit OBJECT_NAME: - AUTHOR (1): - SUBJECT - are available in the git repository at: + SUBJECT (DATE) + are available in the git repository at: URL BRANCH SHORTLOG