From: Yakov Lerner Date: Mon, 22 May 2006 19:34:00 +0000 (+0300) Subject: Problem: 'trap...exit' causes error message when /bin/sh is ash. X-Git-Tag: v1.4.0-rc1~96 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f803eec51b6fe812c523c8f6474e029163b307e8;p=git.git Problem: 'trap...exit' causes error message when /bin/sh is ash. Problem: 'trap...exit' causes error message when /bin/sh is ash. Fix: Change 'trap...exit' to 'trap...0' like in other scripts. Signed-off-by: Yakov Lerner Signed-off-by: Junio C Hamano --- diff --git a/git-clone.sh b/git-clone.sh index 227245c86..d96894d4c 100755 --- a/git-clone.sh +++ b/git-clone.sh @@ -199,7 +199,7 @@ dir="$2" [ -e "$dir" ] && echo "$dir already exists." && usage mkdir -p "$dir" && D=$(cd "$dir" && pwd) && -trap 'err=$?; cd ..; rm -r "$D"; exit $err' exit +trap 'err=$?; cd ..; rm -r "$D"; exit $err' 0 case "$bare" in yes) GIT_DIR="$D" ;; *) GIT_DIR="$D/.git" ;; @@ -407,5 +407,5 @@ Pull: refs/heads/$head_points_at:$origin_track" && fi rm -f "$GIT_DIR/CLONE_HEAD" "$GIT_DIR/REMOTE_HEAD" -trap - exit +trap - 0