tests: allow sha1's as part of the path
authorDennis Kaarsemaker <dennis@kaarsemaker.net>
Sat, 15 Jun 2013 21:35:02 +0000 (23:35 +0200)
committerJunio C Hamano <gitster@pobox.com>
Mon, 17 Jun 2013 19:59:50 +0000 (12:59 -0700)
When running 'make test' from a path such as
.../daily-build/master@bdff0e3a374617dce784f801b97500d9ba2e4705, the
logic in fuzz.sed as generated by t5105-request-pull.sh was backwards,
replacing object names before replacing urls, making the test fail.

Signed-off-by: Dennis Kaarsemaker <dennis@kaarsemaker.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t5150-request-pull.sh
index 432f98c357601057cb89f9dd6bfbe1ab02e9477a..1afa0d5c44e00a401cb32ec4bca13c4c6882fd07 100755 (executable)
@@ -80,12 +80,12 @@ test_expect_success 'setup: two scripts for reading pull requests' '
 
        cat <<-EOT >fuzz.sed
        #!/bin/sed -nf
+       s/$downstream_url_for_sed/URL/g
        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
        s/^version [0-9]/VERSION/