X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=all;h=e5674a9e21e5894b3c5b792388124a6c7c0d35c2;hp=3e372b8557f8b1f607b6609dbf52f82fe88791c8;hb=ae86caef928f46a4b3f70a2901cfc6a61fcfaeb0;hpb=1ae8075e8fcd2e993260ed99b1d02e55f29c63cd;ds=sidebyside diff --git a/all b/all index 3e372b85..e5674a9e 100755 --- a/all +++ b/all @@ -120,7 +120,7 @@ div0-gittools | d0_blind_id | | master | data/xonotic-maps.pk3dir | | master | mediasource | | master | no -fteqcc | | xonotic-stable | +fteqcc | | xonotic-stable | noautocrlf " # todo: in darkplaces, change repobranch to div0-stable @@ -308,7 +308,14 @@ fix_git_config() verbose git config --unset remote.origin.pushurl || true fi verbose git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*" - verbose git config core.autocrlf input + case ",`repoflags "$d"`," in + *,noautocrlf,*) + verbose git config --unset core.autocrlf + ;; + *) + verbose git config core.autocrlf input + ;; + esac if [ -z "`git config push.default || true`" ]; then verbose git config push.default current # or is tracking better? fi