From 59c40eee8e9232f556e9d4c8c97eb1b866846af3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Cornell=C3=A0?= Date: Thu, 27 Jan 2022 18:01:27 +0100 Subject: [PATCH] fix(installer): avoid `git clone -c` to support git v1.7.1 (#10621) --- tools/install.sh | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/tools/install.sh b/tools/install.sh index 34dca8413..2290bc1eb 100755 --- a/tools/install.sh +++ b/tools/install.sh @@ -263,13 +263,19 @@ setup_ohmyzsh() { exit 1 fi - git clone -c core.eol=lf -c core.autocrlf=false \ - -c fsck.zeroPaddedFilemode=ignore \ - -c fetch.fsck.zeroPaddedFilemode=ignore \ - -c receive.fsck.zeroPaddedFilemode=ignore \ - -c oh-my-zsh.remote=origin \ - -c oh-my-zsh.branch="$BRANCH" \ - --depth=1 --branch "$BRANCH" "$REMOTE" "$ZSH" || { + # Manual clone with git config options to support git < v1.7.2 + git init "$ZSH" && cd "$ZSH" \ + && git config core.eol lf \ + && git config core.autocrlf false \ + && git config fsck.zeroPaddedFilemode ignore \ + && git config fetch.fsck.zeroPaddedFilemode ignore \ + && git config receive.fsck.zeroPaddedFilemode ignore \ + && git config oh-my-zsh.remote origin \ + && git config oh-my-zsh.branch "$BRANCH" \ + && git remote add origin "$REMOTE" \ + && git fetch --depth=1 origin \ + && git checkout -b "$BRANCH" "origin/$BRANCH" || { + rm -rf "$ZSH" fmt_error "git clone of oh-my-zsh repo failed" exit 1 }