On 10/5/22 22:09, Tobias Burnus wrote:
> On 05.10.22 20:41, Martin Liška wrote:
>> +++ 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')
>
> Don't you need a 'rebase' in addition?
Well, no, because that would mean the script won't generate a ChangeLog entry
for some commits.
> Or alternately – putting 'fetch'
> before 'commit' and then 'merge' would be alternately possible.
Well, the window is pretty small, in between 'git pull' and processing the
ChangeLog entries
it should take only a few seconds before a push is done.
Anyway, it failed today again, let me add more robust logging.
Martin
>
> Tobias
>
> -----------------
> Siemens Electronic Design Automation GmbH; Anschrift: Arnulfstraße 201, 80634
> München; Gesellschaft mit beschränkter Haftung; Geschäftsführer: Thomas
> Heurung, Frank Thürauf; Sitz der Gesellschaft: München; Registergericht
> München, HRB 106955
