From 245b0736598611b74f538d3274fbea8d48e8157f Mon Sep 17 00:00:00 2001 From: lejeune quentin Date: Fri, 8 Jul 2022 11:52:54 +0000 Subject: [PATCH] [FIX] point_of_sale: Fix cleaning git between 2 version of iot When iot switch between 2 version of odoo we must clean correctly the branch. Now -dfx erases each and every file in git directory which is not part of repository. (like drivers and interfaces) closes odoo/odoo#95698 X-original-commit: c115f9f873c8ae46b079684ac90fcd6ab9fcadad Signed-off-by: Masereel Pierre --- .../point_of_sale/tools/posbox/configuration/posbox_update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/point_of_sale/tools/posbox/configuration/posbox_update.sh b/addons/point_of_sale/tools/posbox/configuration/posbox_update.sh index 2bfb9f3aec2..4ba5af4f846 100755 --- a/addons/point_of_sale/tools/posbox/configuration/posbox_update.sh +++ b/addons/point_of_sale/tools/posbox/configuration/posbox_update.sh @@ -13,7 +13,7 @@ echo "addons/point_of_sale/tools/posbox/overwrite_after_init/home/pi/odoo" >> .g git fetch "${localremote}" "${localbranch}" --depth=1 git reset "${localremote}"/"${localbranch}" --hard -git clean -df +git clean -dfx cp -a /home/pi/odoo/addons/point_of_sale/tools/posbox/overwrite_after_init/home/pi/odoo/* /home/pi/odoo/ rm -r /home/pi/odoo/addons/point_of_sale/tools/posbox/overwrite_after_init