public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r13-3097] contrib: run fetch before pushing Daily bump
@ 2022-10-05 18:42 Martin Liska
0 siblings, 0 replies; only message in thread
From: Martin Liska @ 2022-10-05 18:42 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:59110467908baf11d3c2100e29bdbf7090e11940
commit r13-3097-g59110467908baf11d3c2100e29bdbf7090e11940
Author: Martin Liska <mliska@suse.cz>
Date: Wed Oct 5 20:39:19 2022 +0200
contrib: run fetch before pushing Daily bump
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.
Diff:
---
contrib/gcc-changelog/git_update_version.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/contrib/gcc-changelog/git_update_version.py b/contrib/gcc-changelog/git_update_version.py
index 05a9f7e402d..8462179b5ab 100755
--- a/contrib/gcc-changelog/git_update_version.py
+++ b/contrib/gcc-changelog/git_update_version.py
@@ -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)
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2022-10-05 18:42 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-10-05 18:42 [gcc r13-3097] contrib: run fetch before pushing Daily bump Martin Liska
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).