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 /git-request-pull.sh | |
| parent | a031d76eebbe85c93f5d4a2a4cafacf417df9bce (diff) | |
| parent | 23b093ee087e99049585487f59e262a0e0662b6e (diff) | |
| download | git-919e06b2288270f47c55759e8810b87f74609caf.tar.gz | |
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 'git-request-pull.sh')
| -rwxr-xr-x | git-request-pull.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/git-request-pull.sh b/git-request-pull.sh index 74238b0313..6fdea397dd 100755 --- a/git-request-pull.sh +++ b/git-request-pull.sh @@ -1,4 +1,4 @@ -#!/bin/sh -e +#!/bin/sh # Copyright 2005, Ryan Anderson <ryan@michonline.com> # # This file is licensed under the GPL v2, or a later version @@ -70,10 +70,10 @@ git show -s --format='The following changes since commit %H: %s (%ci) -are available in the git repository at:' $baserev -echo " $url $branch" -echo +are available in the git repository at:' $baserev && +echo " $url $branch" && +echo && -git shortlog ^$baserev $headrev -git diff -M --stat --summary $patch $merge_base..$headrev +git shortlog ^$baserev $headrev && +git diff -M --stat --summary $patch $merge_base..$headrev || exit exit $status |