From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from esa3.mentor.iphmx.com (esa3.mentor.iphmx.com [68.232.137.180]) by sourceware.org (Postfix) with ESMTPS id 746393858CDB for ; Wed, 5 Oct 2022 20:09:31 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 746393858CDB Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=codesourcery.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=mentor.com X-IronPort-AV: E=Sophos;i="5.95,161,1661846400"; d="scan'208";a="84062057" Received: from orw-gwy-02-in.mentorg.com ([192.94.38.167]) by esa3.mentor.iphmx.com with ESMTP; 05 Oct 2022 12:09:24 -0800 IronPort-SDR: nSQb+5V/c1rHlFOD/0Kw4B4aWxs+kw7HJ41Mp3VXBMSqjwSpy8PhPCKvZuDr/jtRXIGmmOGChH xieO07aki7H2nwOHzxKij258gAPVwjUBrCmbMtK9HVfs0RxVRcM/Z8JlbdSS6oqFWS8lOhBiqW 4oocPjWnBrKj52KoRkzeNcNfPIywL3M8h2ujlxBEtFm7XPLZGXhN2QgK6tos8ygkV/V+SEobhr JZCUf6sHUbI2E6/FYzzNpS0KphRXQSRaY+38/LFOlZsfVC5bJSi/Xxrqpb+SbFe6BVpsip+0bh DVU= Message-ID: <138b2bba-cb07-c215-2fdc-cef324bb7f21@codesourcery.com> Date: Wed, 5 Oct 2022 22:09:16 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.3.1 Subject: Re: [PATCH][pushed] contrib: run fetch before pushing Daily bump Content-Language: en-US To: =?UTF-8?Q?Martin_Li=c5=a1ka?= , CC: Jakub Jelinek , Jonathan Wakely References: <29487d53-ef09-764b-cbd0-0fa09f459fc3@suse.cz> From: Tobias Burnus In-Reply-To: <29487d53-ef09-764b-cbd0-0fa09f459fc3@suse.cz> Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: quoted-printable X-Originating-IP: [137.202.0.90] X-ClientProxiedBy: svr-ies-mbx-11.mgc.mentorg.com (139.181.222.11) To svr-ies-mbx-12.mgc.mentorg.com (139.181.222.12) X-Spam-Status: No, score=-6.1 required=5.0 tests=BAYES_00,HEADER_FROM_DIFFERENT_DOMAINS,KAM_DMARC_STATUS,NICE_REPLY_A,SPF_HELO_PASS,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: On 05.10.22 20:41, Martin Li=C5=A1ka 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 =E2=80=93 putting 'fe= tch' before 'commit' and then 'merge' would be alternately possible. Tobias ----------------- Siemens Electronic Design Automation GmbH; Anschrift: Arnulfstra=C3=9Fe 201= , 80634 M=C3=BCnchen; Gesellschaft mit beschr=C3=A4nkter Haftung; Gesch=C3= =A4ftsf=C3=BChrer: Thomas Heurung, Frank Th=C3=BCrauf; Sitz der Gesellschaf= t: M=C3=BCnchen; Registergericht M=C3=BCnchen, HRB 106955