Commit 534ec60b authored by Marc Cornellà's avatar Marc Cornellà
Browse files

Set default git-config values known to fix repository issues

- core.autocrlf=false -> #4069
- fsck.zeroPaddedFilemode -> #4963

Fixes #4069
Fixes #4963
parent a7c740b1
...@@ -90,7 +90,11 @@ setup_ohmyzsh() { ...@@ -90,7 +90,11 @@ setup_ohmyzsh() {
exit 1 exit 1
fi 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" error "git clone of oh-my-zsh repo failed"
exit 1 exit 1
} }
......
...@@ -20,8 +20,18 @@ else ...@@ -20,8 +20,18 @@ else
NORMAL="" NORMAL=""
fi fi
printf "${BLUE}%s${NORMAL}\n" "Updating Oh My Zsh"
cd "$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 if git pull --rebase --stat origin master
then then
printf '%s' "$GREEN" printf '%s' "$GREEN"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment