Reformatting whitespace
This commit is contained in:
parent
e96bfe9777
commit
ca545497e0
|
@ -28,8 +28,8 @@ def build_peach_config(default_branch=True):
|
||||||
if default_branch:
|
if default_branch:
|
||||||
# because some repo have main as default and some as master, we get the default
|
# because some repo have main as default and some as master, we get the default
|
||||||
default_branch = subprocess.check_output(['git', 'rev-parse', '--abbrev-ref', 'origin/HEAD'],
|
default_branch = subprocess.check_output(['git', 'rev-parse', '--abbrev-ref', 'origin/HEAD'],
|
||||||
cwd=service_path).decode(sys.stdout.encoding)
|
cwd=service_path).decode(sys.stdout.encoding).strip()
|
||||||
branch = default_branch.replace('origin/', '').strip()
|
branch = default_branch.replace('origin/', '')
|
||||||
subprocess.check_call(["git", "checkout", branch], cwd=service_path)
|
subprocess.check_call(["git", "checkout", branch], cwd=service_path)
|
||||||
subprocess.check_call(["git", "fetch", "--all"], cwd=service_path)
|
subprocess.check_call(["git", "fetch", "--all"], cwd=service_path)
|
||||||
subprocess.check_call(["git", "reset", "--hard", default_branch], cwd=service_path)
|
subprocess.check_call(["git", "reset", "--hard", default_branch], cwd=service_path)
|
||||||
|
|
|
@ -33,8 +33,8 @@ def build_rust_packages(default_branch=False):
|
||||||
if default_branch:
|
if default_branch:
|
||||||
# because some repo have main as default and some as master, we get the default
|
# because some repo have main as default and some as master, we get the default
|
||||||
default_branch = subprocess.check_output(['git', 'rev-parse', '--abbrev-ref', 'origin/HEAD'],
|
default_branch = subprocess.check_output(['git', 'rev-parse', '--abbrev-ref', 'origin/HEAD'],
|
||||||
cwd=service_path).decode(sys.stdout.encoding)
|
cwd=service_path).decode(sys.stdout.encoding).strip()
|
||||||
branch = default_branch.replace('origin/', '').strip()
|
branch = default_branch.replace('origin/', '')
|
||||||
subprocess.check_call(["git", "checkout", branch], cwd=service_path)
|
subprocess.check_call(["git", "checkout", branch], cwd=service_path)
|
||||||
subprocess.check_call(["git", "fetch", "--all"], cwd=service_path)
|
subprocess.check_call(["git", "fetch", "--all"], cwd=service_path)
|
||||||
subprocess.check_call(["git", "reset", "--hard", default_branch], cwd=service_path)
|
subprocess.check_call(["git", "reset", "--hard", default_branch], cwd=service_path)
|
||||||
|
|
Loading…
Reference in New Issue