From 9b4bdaf794a57378b02169849e5db95b122cf518 Mon Sep 17 00:00:00 2001 From: Martin Liska Date: Thu, 18 Jun 2020 14:44:04 +0200 Subject: [PATCH] gcc-changelog: checkout & pull order contrib/ChangeLog: * gcc-changelog/git_update_version.py: First checkout and then run git pull ---rebase. --- contrib/gcc-changelog/git_update_version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/gcc-changelog/git_update_version.py b/contrib/gcc-changelog/git_update_version.py index 7077880cf80..ac1b206d238 100755 --- a/contrib/gcc-changelog/git_update_version.py +++ b/contrib/gcc-changelog/git_update_version.py @@ -137,8 +137,8 @@ else: else: branch = repo.create_head(name, ref).set_tracking_branch(ref) print('=== Working on: %s ===' % branch, flush=True) - origin.pull(rebase=True) branch.checkout() + origin.pull(rebase=True) print('branch pulled and checked out') update_current_branch() assert not repo.index.diff(None) -- 2.30.2