gcc-changelog: checkout & pull order

Message ID ea98475c-ea57-db26-7f0c-dfd5f4c42723@suse.cz
State New
Headers show
Series
  • gcc-changelog: checkout & pull order
Related show

Commit Message

Martin Liška June 18, 2020, 12:44 p.m.
This fixes an order of commands.

Installed to master.

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(-)

-- 
2.27.0

Patch

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)