mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-04-05 22:21:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

contrib: run fetch before pushing Daily bump

Browse Source 
As seen from recent days, the script fails when it pushes
a branch while another revision was pushed by a user.
Prevent that by doing fetch right before the pull.

The error message example:

cmdline: git push origin releases/gcc-11
stderr: 'fatal: unable to parse object: 4249a65c814287af667aa78789436d3fc618e80a
error: remote unpack failed: eof before pack header was fully read

contrib/ChangeLog:

	* gcc-changelog/git_update_version.py: Do fetch before a push.
This commit is contained in:
Martin Liska 2022-10-05 20:39:19 +02:00
parent ef87856414
commit 5911046790
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
contrib/gcc-changelog/git_update_version.py
View File

@ -127,6 +127,7 @@ def update_current_branch(ref_name):
repo.git.add(datestamp_path)
if not args.current:
repo.index.commit('Daily bump.')
origin.fetch()
if args.push:
repo.git.push('origin', branch)
print('branch is pushed')
@ -149,7 +150,7 @@ else:
print('=== Working on: %s ===' % branch, flush=True)
branch.checkout()
origin.pull(rebase=True)
print('branch pulled and checked out')
print('branch pulled and checked out', flush=True)
update_current_branch(name)
assert not repo.index.diff(None)
print('branch is done\n', flush=True)