From 26ccd93ef16c4787f643c7954deb8c7e8fe93438 Mon Sep 17 00:00:00 2001 From: Christophe Nanteuil Date: Sun, 12 Feb 2023 21:32:23 +0000 Subject: [PATCH] =?UTF-8?q?merge.py=20corrig=C3=A9=20(#35)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit '3.11'.find('.') Co-authored-by: Christophe Nanteuil Reviewed-on: https://git.afpy.org/AFPy/python-docs-fr/pulls/35 Reviewed-by: Julien Palard Co-authored-by: Christophe Nanteuil Co-committed-by: Christophe Nanteuil --- merge.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/merge.py b/merge.py index acea8914..6cc9f608 100644 --- a/merge.py +++ b/merge.py @@ -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