summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Dennis Kaarsemaker <dennis@kaarsemaker.net>2013-06-15 23:35:02 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-06-17 12:59:50 -0700
commitd77fd050ab8579558d3e8e4e5467a9300546ef2c (patch)
tree5b497d5881e169441fed9434b530ce3a73980c57
parentfast-export: fix argument name in error messages (diff)
downloadtgif-d77fd050ab8579558d3e8e4e5467a9300546ef2c.tar.xz
tests: allow sha1's as part of the path
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>
-rwxr-xr-xt/t5150-request-pull.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t5150-request-pull.sh b/t/t5150-request-pull.sh
index 432f98c357..1afa0d5c44 100755
--- a/t/t5150-request-pull.sh
+++ b/t/t5150-request-pull.sh
@@ -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/