Sync with 1.7.4.3

diff --git a/t/t5150-request-pull.sh b/t/t5150-request-pull.sh
old mode 100644 (file)
new mode 100755 (executable)
index 8e0425b..9cc0a42
--- a/t/t5150-request-pull.sh
+++ b/t/t5150-request-pull.sh
@@ -67,10 +67,9 @@ test_expect_success 'setup: two scripts for reading pull requests' '
 
        cat <<-\EOT >read-request.sed &&
        #!/bin/sed -nf
-       / in the git repository at:$/! d
-       n
-       /^$/! q
+       / in the git repository at:$/!d
        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
@@ -101,7 +102,7 @@ test_expect_success 'setup: two scripts for reading pull requests' '
        /^        [a-zA-Z]/ n
        /^[a-zA-Z]* ([0-9]*):\$/ n
        /^\$/ N
-       /^\n[a-zA-Z]* ([0-9]*):\$/! {
+       /^\n[a-zA-Z]* ([0-9]*):\$/!{
                a\\
        SHORTLOG
                D
@@ -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