git-clone: split up long &&-command-chain and use a function for cleanup

Signed-off-by: Matthias Lederhofer <matled@gmx.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/git-clone.sh b/git-clone.sh
index 48dafa21cf9efef957739408c78ba4ab47494f13..4ca91009dd72ea2adc757b11f386cc4d4441eb38 100755 (executable)
--- a/git-clone.sh
+++ b/git-clone.sh
@@ -187,15 +187,24 @@ dir="$2"
 # Try using "humanish" part of source repo if user didn't specify one
 [ -z "$dir" ] && dir=$(echo "$repo" | sed -e 's|/$||' -e 's|:*/*\.git$||' -e 's|.*[/:]||g')
 [ -e "$dir" ] && die "destination directory '$dir' already exists."
 # Try using "humanish" part of source repo if user didn't specify one
 [ -z "$dir" ] && dir=$(echo "$repo" | sed -e 's|/$||' -e 's|:*/*\.git$||' -e 's|.*[/:]||g')
 [ -e "$dir" ] && die "destination directory '$dir' already exists."

-mkdir -p "$dir" &&
-D=$(cd "$dir" && pwd) &&
-trap 'err=$?; cd ..; rm -rf "$D"; exit $err' 0
+D=
+cleanup() {
+       err=$?
+       test -z "$D" && rm -rf "$dir"
+       cd ..
+       test -n "$D" && rm -rf "$D"
+       exit $err
+}
+trap cleanup 0
+mkdir -p "$dir" && D=$(cd "$dir" && pwd) || usage

 case "$bare" in
 yes)
        GIT_DIR="$D" ;;
 *)
        GIT_DIR="$D/.git" ;;
 case "$bare" in
 yes)
        GIT_DIR="$D" ;;
 *)
        GIT_DIR="$D/.git" ;;

-esac && export GIT_DIR && git init $quiet ${template+"$template"} || usage
+esac &&
+export GIT_DIR &&
+git-init $quiet ${template+"$template"} || usage

 
 if test -n "$reference"
 then
 
 if test -n "$reference"
 then