X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=copy-gitattributes-to-branches.sh;h=6ebe5e3ec14e59fdf8476780dad85a02b2fbc21d;hp=2ffb44fc492c11a519ddd02b28602d0b513b632c;hb=c69c948d1e38505bfe79aff2a0e866990c1883c1;hpb=ee731ded7d825fc801fb5e539dfc8f67383375cf

diff --git a/copy-gitattributes-to-branches.sh b/copy-gitattributes-to-branches.sh
index 2ffb44fc..6ebe5e3e 100755
--- a/copy-gitattributes-to-branches.sh
+++ b/copy-gitattributes-to-branches.sh
@@ -15,12 +15,20 @@ case "$1" in
 		git config core.autocrlf input
 		git reset --hard
 		git for-each-ref 'refs/remotes/origin' | while read -r HASH TYPE REFNAME; do
+			case "$REFNAME" in
+				refs/remotes/origin/HEAD)
+					continue
+					;;
+			esac
 			git checkout -t "${REFNAME#refs/remotes/}" || git checkout "${REFNAME#refs/remotes/origin/}"
 			git reset --hard "$REFNAME"
 			echo "$attr" > "${me%/*}/.gitattributes"
 			git update-index --refresh
-			git commit -a -m"CRLF"
+			git add .gitattributes
+			git commit -a -m"CRLF fixes, .gitattributes file updated"
 		done
+		git checkout master
+		true
 		;;
 	*)
 		attr=`cat .gitattributes`