summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-06-24 13:48:46 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-06-24 13:48:47 -0700
commit9a3f5986f7da15d490e8aa3977dd7384f1eef9dd (patch)
tree17089855c2c266be3aeed06bf6bebf76a16ec539
parentMerge branch 'rs/unpack-trees-tree-walk-conflict-field' (diff)
parenttests: allow sha1's as part of the path (diff)
downloadtgif-9a3f5986f7da15d490e8aa3977dd7384f1eef9dd.tar.xz
Merge branch 'dk/maint-t5150-dirname'
Fix a test script. * dk/maint-t5150-dirname: tests: allow sha1's as part of the path
-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/