search

Vauxoo / maintainer-quality-tools

QA tools for Odoo maintainers
GNU Affero General Public License v3.0
3 stars 9 forks source link

[REF] clone_oca_dependencies: Add '--ff-only' param to git pull #319

Closed luisg123v closed 3 years ago

luisg123v commented 3 years ago

Cherry-pick of https://github.com/oca/maintainer-quality-tools/commit/772bd249

luisg123v commented 3 years ago

@moylop260 could you merge, please?

This is a cherry-pick of https://github.com/oca/maintainer-quality-tools/commit/772bd249, which is been in the OCA for years (and it's yours BTW).

It's now required because recent versions of git require an explicit parameter when pulling, otherwise they give the following error:

warning: Pulling without specifying how to reconcile divergent branches is discouraged

CC @ysantiago