From: Tobias Burnus <tobias@codesourcery.com>
To: "Martin Liška" <mliska@suse.cz>, gcc-patches@gcc.gnu.org
Cc: Jakub Jelinek <jakub@redhat.com>,
Jonathan Wakely <jwakely.gcc@gmail.com>
Subject: Re: [PATCH][pushed] contrib: run fetch before pushing Daily bump
Date: Wed, 5 Oct 2022 22:09:16 +0200 [thread overview]
Message-ID: <138b2bba-cb07-c215-2fdc-cef324bb7f21@codesourcery.com> (raw)
In-Reply-To: <29487d53-ef09-764b-cbd0-0fa09f459fc3@suse.cz>
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? Or alternately – putting 'fetch'
before 'commit' and then 'merge' would be alternately possible.
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
next prev parent reply other threads:[~2022-10-05 20:09 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-05 18:41 Martin Liška
2022-10-05 20:09 ` Tobias Burnus [this message]
2022-10-06 9:13 ` Martin Liška
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=138b2bba-cb07-c215-2fdc-cef324bb7f21@codesourcery.com \
--to=tobias@codesourcery.com \
--cc=gcc-patches@gcc.gnu.org \
--cc=jakub@redhat.com \
--cc=jwakely.gcc@gmail.com \
--cc=mliska@suse.cz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).