Merge branches 'jc/fix-co-candy', 'jc/fix-rename-leak' and 'ar/fix-win' into maint
* jc/fix-co-candy: checkout - eye candy. * jc/fix-rename-leak: diffcore-rename: plug memory leak. * ar/fix-win: fix t5600-clone-fail-cleanup.sh on windows
This commit is contained in:
@ -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
|
||||
|
||||
|
Reference in New Issue
Block a user