From: Brandon Casey Date: Wed, 2 Jun 2010 00:13:41 +0000 (-0500) Subject: git-request-pull.sh: remove -e switch to shell interpreter which breaks ksh X-Git-Tag: v1.7.2-rc0~33^2~5 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=53dfac44c93d5861f0ab60fc38e1a2d3b67e8c62;p=git.git git-request-pull.sh: remove -e switch to shell interpreter which breaks ksh The -e option causes the shell to exit immediately when a command exits with a non-zero exit status. This does not seem to cause a problem for Bash, but it does cause a problem for the Korn shell, like Solaris's xpg4/sh, whose unset utility returns non-zero if it is passed a variable name which was not previously set. When using xpg4/sh, git-request-pull exits while sourcing git-sh-setup since git-sh-setup tries to unset the CDPATH environment variable. When git-request-pull was originally written, it did not do any error checking and it used this shell feature to exit when an error occurred. This script now performs proper error checking and provides useful error messages, so this -e option appears to be merely a historical artifact and can be removed. Kudos to Jonathan Nieder for introducing t5150 which exercises the request-pull code path. Suggested-by: Brandon Casey Signed-off-by: Jonathan Nieder Signed-off-by: Junio C Hamano --- diff --git a/git-request-pull.sh b/git-request-pull.sh index 74238b031..6fdea397d 100755 --- a/git-request-pull.sh +++ b/git-request-pull.sh @@ -1,4 +1,4 @@ -#!/bin/sh -e +#!/bin/sh # Copyright 2005, Ryan Anderson # # 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