diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-06-21 06:02:42 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-06-21 06:02:42 -0700 |
| commit | 919e06b2288270f47c55759e8810b87f74609caf (patch) | |
| tree | 2fe295a61f1d61e56db0626ec33131375c2152f8 /t/t5150-request-pull.sh | |
| parent | a031d76eebbe85c93f5d4a2a4cafacf417df9bce (diff) | |
| parent | 23b093ee087e99049585487f59e262a0e0662b6e (diff) | |
| download | git-919e06b2288270f47c55759e8810b87f74609caf.tar.gz git-919e06b2288270f47c55759e8810b87f74609caf.tar.xz | |
Merge branch 'bc/portable'
* bc/portable:
Remove python 2.5'isms
Makefile: add PYTHON_PATH to GIT-BUILD-OPTIONS
t/aggregate-results: accomodate systems with small max argument list length
t/t7006: ignore return status of shell's unset builtin
t/t5150: remove space from sed script
git-request-pull.sh: remove -e switch to shell interpreter which breaks ksh
t/t5800: skip if python version is older than 2.5
Diffstat (limited to 't/t5150-request-pull.sh')
| -rwxr-xr-x | t/t5150-request-pull.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t5150-request-pull.sh b/t/t5150-request-pull.sh index 169d3ea37..9cc0a42ea 100755 --- a/t/t5150-request-pull.sh +++ b/t/t5150-request-pull.sh @@ -67,7 +67,7 @@ test_expect_success 'setup: two scripts for reading pull requests' ' cat <<-\EOT >read-request.sed && #!/bin/sed -nf - / in the git repository at:$/! d + / in the git repository at:$/!d n /^$/ n s/^[ ]*\(.*\) \([^ ]*\)/please pull\ @@ -102,7 +102,7 @@ test_expect_success 'setup: two scripts for reading pull requests' ' /^ [a-zA-Z]/ n /^[a-zA-Z]* ([0-9]*):\$/ n /^\$/ N - /^\n[a-zA-Z]* ([0-9]*):\$/! { + /^\n[a-zA-Z]* ([0-9]*):\$/!{ a\\ SHORTLOG D |