diff --git a/peach_package_builder/build_peach_config.py b/peach_package_builder/build_peach_config.py index 36570e6..0171668 100644 --- a/peach_package_builder/build_peach_config.py +++ b/peach_package_builder/build_peach_config.py @@ -31,8 +31,8 @@ def build_peach_config(default_branch=True): cwd=service_path).decode(sys.stdout.encoding) branch = default_branch.replace('origin/', '').strip() subprocess.check_call(["git", "checkout", branch], cwd=service_path) - subprocess.check_call(["git", "reset", "HEAD", "--hard"], cwd=service_path) - subprocess.check_call(["git", "pull"], cwd=service_path) + subprocess.check_call(["git", "fetch", "--all"], cwd=service_path) + subprocess.check_call(["git", "reset", "--hard", default_branch], cwd=service_path) # remove old build dir subprocess.check_call([ "rm", diff --git a/peach_package_builder/build_rust_packages.py b/peach_package_builder/build_rust_packages.py index 68a821c..9219396 100644 --- a/peach_package_builder/build_rust_packages.py +++ b/peach_package_builder/build_rust_packages.py @@ -36,8 +36,8 @@ def build_rust_packages(default_branch=False): cwd=service_path).decode(sys.stdout.encoding) branch = default_branch.replace('origin/', '').strip() subprocess.check_call(["git", "checkout", branch], cwd=service_path) - subprocess.check_call(["git", "reset", "HEAD", "--hard"], cwd=service_path) - subprocess.check_call(["git", "pull"], cwd=service_path) + subprocess.check_call(["git", "fetch", "--all"], cwd=service_path) + subprocess.check_call(["git", "reset", "--hard", default_branch], cwd=service_path) debian_package_path = subprocess.check_output( [ CARGO_PATH,