aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Liska <mliska@suse.cz>2020-06-18 14:44:04 +0200
committerGiuliano Belinassi <giuliano.belinassi@usp.br>2020-08-17 13:14:00 -0300
commit7e0ec1dc0eb980db430cc1cb8af225529c1d10e7 (patch)
treeb0ef17cf0ca7dbf7728828bd5d44775fe724b95f
parent1d0bb03baa2ddc8105279a915dba3d0e0ba3b223 (diff)
downloadgcc-7e0ec1dc0eb980db430cc1cb8af225529c1d10e7.zip
gcc-7e0ec1dc0eb980db430cc1cb8af225529c1d10e7.tar.gz
gcc-7e0ec1dc0eb980db430cc1cb8af225529c1d10e7.tar.bz2
gcc-changelog: checkout & pull order
contrib/ChangeLog: * gcc-changelog/git_update_version.py: First checkout and then run git pull ---rebase.
-rwxr-xr-xcontrib/gcc-changelog/git_update_version.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/gcc-changelog/git_update_version.py b/contrib/gcc-changelog/git_update_version.py
index 7077880..ac1b206 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)