verbose git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"
case ",`repoflags "$d"`," in
*,noautocrlf,*)
- verbose git config --unset core.autocrlf
+ verbose git config --unset core.autocrlf || true
;;
*)
verbose git config core.autocrlf input
reportecho "$o"
}
for d in $repos; do
+ case "$d" in
+ fteqcc)
+ # sorry, fteqcc repo is managed manually
+ continue
+ ;;
+ esac
enter "$d0/$d" verbose
base="`repobranch "$d"`"
reportecho "In $d:"
reportecho4 "--> test failed, postponed"
fi
else
+ # apply crlf, or other cleanup filters (non-behavioural changes)
+ git reset --hard
+ find . -type f -exec touch {} \;
+ git commit -a --amend -c HEAD || true # don't fail if nothing to commit
+
echo "MERGING"
case ",`repoflags "$d"`," in
*,svn,*)