AFPy/python-docs-fr
AFPy/python-docs-fr
11
11
Fork 82
Code Issues 7 Pull requests 10 Activity

merge.py corrigé (#35)

Browse source 
'3.11'.find('.')

Co-authored-by: Christophe Nanteuil <christophe.nanteuil@gmail.com>
Reviewed-on: #35
Reviewed-by: Julien Palard <julien@palard.fr>
Co-authored-by: Christophe Nanteuil <christophenan@noreply.localhost>
Co-committed-by: Christophe Nanteuil <christophenan@noreply.localhost>
This commit is contained in:
Christophe Nanteuil 2023-02-12 21:32:23 +00:00 • committed by Julien Palard
commit 26ccd93ef1
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
merge.py
View file

@ -38,7 +38,7 @@ def parse_args():
def setup_repo(repo_path: Path, branch: str):
"""Ensure we're up-to-date."""
if branch.find('.') == 2:
if branch.find('.') == 1:
run("git", "-C", repo_path, "checkout", branch)
run("git", "-C", repo_path, "pull", "--ff-only")
else: # it's a commit