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 <iler.ml@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Yakov Lerner
2006-05-22 22:34:00 +03:00
committed by Junio C Hamano
parent e3008464e7
commit f803eec51b

View File

@ -199,7 +199,7 @@ dir="$2"
[ -e "$dir" ] && echo "$dir already exists." && usage [ -e "$dir" ] && echo "$dir already exists." && usage
mkdir -p "$dir" && mkdir -p "$dir" &&
D=$(cd "$dir" && pwd) && 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 case "$bare" in
yes) GIT_DIR="$D" ;; yes) GIT_DIR="$D" ;;
*) GIT_DIR="$D/.git" ;; *) GIT_DIR="$D/.git" ;;
@ -407,5 +407,5 @@ Pull: refs/heads/$head_points_at:$origin_track" &&
fi fi
rm -f "$GIT_DIR/CLONE_HEAD" "$GIT_DIR/REMOTE_HEAD" rm -f "$GIT_DIR/CLONE_HEAD" "$GIT_DIR/REMOTE_HEAD"
trap - exit trap - 0