diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-02-24 09:27:03 +0300 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-02-24 09:27:03 +0300 |
| commit | 816c02ce8ecddce065e83db9f4ecb78f6b0e23dc (patch) | |
| tree | b85fa8225e982f67dd4e9d516b92c3f03a1f99bc /git-clone.sh | |
| parent | 1d3d03bbeaaf55844868affc96231930aae792e6 (diff) | |
| parent | 7bd1527d2d8c80a6e9a0f8583082a5aee5428c68 (diff) | |
Merge fixes early for next maint series.
Diffstat (limited to 'git-clone.sh')
| -rwxr-xr-x | git-clone.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-clone.sh b/git-clone.sh index dc0ad552a3..4ed861d576 100755 --- a/git-clone.sh +++ b/git-clone.sh @@ -118,7 +118,7 @@ dir="$2" [ -e "$dir" ] && echo "$dir already exists." && usage mkdir -p "$dir" && D=$(cd "$dir" && pwd) && -trap 'err=$?; rm -r $D; exit $err' exit +trap 'err=$?; cd ..; rm -r "$D"; exit $err' exit case "$bare" in yes) GIT_DIR="$D" ;; *) GIT_DIR="$D/.git" ;; @@ -253,7 +253,7 @@ Pull: $head_points_at:$origin" && case "$no_checkout" in '') - git checkout + git-read-tree -m -u -v HEAD HEAD esac fi |