diff options
| author | Tuowen Zhao <ztuowen@gmail.com> | 2019-10-21 16:01:02 -0600 |
|---|---|---|
| committer | Tuowen Zhao <ztuowen@gmail.com> | 2019-10-21 16:01:02 -0600 |
| commit | 2e9fe98b8a9fe21b982e719e129678dede63771e (patch) | |
| tree | e1dd9634ace0de1c752bddcbc67a998b7d73d40b /tools | |
| parent | 112a85697481cae663ff281b74fdc1f72a67b294 (diff) | |
| parent | 534ec60bfd14ee640076c7594ee4fa723fafd1b1 (diff) | |
| download | zsh-2e9fe98b8a9fe21b982e719e129678dede63771e.tar.gz zsh-2e9fe98b8a9fe21b982e719e129678dede63771e.tar.bz2 zsh-2e9fe98b8a9fe21b982e719e129678dede63771e.zip | |
Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/install.sh | 6 | ||||
| -rw-r--r-- | tools/upgrade.sh | 12 |
2 files changed, 16 insertions, 2 deletions
diff --git a/tools/install.sh b/tools/install.sh index 61010214e..a5a90e6f6 100755 --- a/tools/install.sh +++ b/tools/install.sh @@ -90,7 +90,11 @@ setup_ohmyzsh() { exit 1 fi - git clone --depth=1 --branch "$BRANCH" "$REMOTE" "$ZSH" || { + git clone -c core.eol=lf -c core.autocrlf=false \ + -c fsck.zeroPaddedFilemode=ignore \ + -c fetch.fsck.zeroPaddedFilemode=ignore \ + -c receive.fsck.zeroPaddedFilemode=ignore \ + --depth=1 --branch "$BRANCH" "$REMOTE" "$ZSH" || { error "git clone of oh-my-zsh repo failed" exit 1 } diff --git a/tools/upgrade.sh b/tools/upgrade.sh index d234c7f88..0dd855b70 100644 --- a/tools/upgrade.sh +++ b/tools/upgrade.sh @@ -20,8 +20,18 @@ else NORMAL="" fi -printf "${BLUE}%s${NORMAL}\n" "Updating Oh My Zsh" cd "$ZSH" + +# Set git-config values known to fix git errors +# Line endings (#4069) +git config core.eol lf +git config core.autocrlf false +# zeroPaddedFilemode fsck errors (#4963) +git config fsck.zeroPaddedFilemode ignore +git config fetch.fsck.zeroPaddedFilemode ignore +git config receive.fsck.zeroPaddedFilemode ignore + +printf "${BLUE}%s${NORMAL}\n" "Updating Oh My Zsh" if git pull --rebase --stat origin master then printf '%s' "$GREEN" |