Merge branch 'bw/diff-metainfo-color'

diff --git a/t/t5150-request-pull.sh b/t/t5150-request-pull.sh
old mode 100644 (file)
new mode 100755 (executable)
index e012a36..169d3ea
--- 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
@@ -92,7 +93,7 @@ test_expect_success 'setup: two scripts for reading pull requests' '
        : diffstat
        n
        / [0-9]* files changed/ {
-               a\
+               a\\
        DIFFSTAT
                b
        }
@@ -102,7 +103,7 @@ test_expect_success 'setup: two scripts for reading pull requests' '
        /^[a-zA-Z]* ([0-9]*):\$/ n
        /^\$/ N
        /^\n[a-zA-Z]* ([0-9]*):\$/! {
-               a\
+               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
@@ -211,4 +211,18 @@ test_expect_success 'pull request format' '
 
 '
 
+test_expect_success 'request-pull ignores OPTIONS_KEEPDASHDASH poison' '
+
+       (
+               cd local &&
+               OPTIONS_KEEPDASHDASH=Yes &&
+               export OPTIONS_KEEPDASHDASH &&
+               git checkout initial &&
+               git merge --ff-only master &&
+               git push origin master:for-upstream &&
+               git request-pull -- initial "$downstream_url" >../request
+       )
+
+'
+
 test_done