X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=t%2Ft5150-request-pull.sh;h=169d3ea376f68a0924920b52748ba64356084eab;hb=44e08b003d37440fba6589c07a9573df9d28e6f5;hp=e012a364e1159926fe3bd296451269372c63b676;hpb=30c56eaa2e7ab230a89a6fdc76682d2afaf5d4b1;p=git.git

diff --git a/t/t5150-request-pull.sh b/t/t5150-request-pull.sh
old mode 100644
new mode 100755
index e012a364e..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
@@ -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