From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2001:67c:2178:6::1d]) by sourceware.org (Postfix) with ESMTPS id B930C3857BA6 for ; Thu, 6 Oct 2022 09:13:36 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org B930C3857BA6 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=suse.cz Authentication-Results: sourceware.org; spf=fail smtp.mailfrom=suse.cz Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 94F721F8F1; Thu, 6 Oct 2022 09:13:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1665047615; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=fVBtmLAa9CPQdkrRvwHlxE3Q73Lh7eb668gbpIMrs88=; b=e0wsuOZyf6gm9UQEJkgvOcp1ZfY8Lh04hfFMLGUVnAKrTvcuo1A/rXQ317kuctS/3CAUI0 8bTF2cR7JS6trSNsWy0tO5MgegJrcfkj1jr0bQJ78pSbmRF9szrsyqcFfF31ccqpcPWTsF G/JW5U/I/qj0sFcG0AXNbCLoyWs2PLo= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1665047615; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=fVBtmLAa9CPQdkrRvwHlxE3Q73Lh7eb668gbpIMrs88=; b=8WHYOVkOG42boP4OAOSp+GvaSR6psuMch8GWnu9C53XVCsSZISdUvm9TAuiwvjHSi8KqUb ZbePOSSxEDdemwBQ== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 6A21C1376E; Thu, 6 Oct 2022 09:13:35 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id dsvdGD+cPmNzTAAAMHmgww (envelope-from ); Thu, 06 Oct 2022 09:13:35 +0000 Message-ID: <8b8ed7a4-b8ba-aee1-de91-a84e6ffceeaa@suse.cz> Date: Thu, 6 Oct 2022 11:13:35 +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: Tobias Burnus , gcc-patches@gcc.gnu.org Cc: Jakub Jelinek , Jonathan Wakely References: <29487d53-ef09-764b-cbd0-0fa09f459fc3@suse.cz> <138b2bba-cb07-c215-2fdc-cef324bb7f21@codesourcery.com> From: =?UTF-8?Q?Martin_Li=c5=a1ka?= In-Reply-To: <138b2bba-cb07-c215-2fdc-cef324bb7f21@codesourcery.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-5.0 required=5.0 tests=BAYES_00,BODY_8BITS,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,NICE_REPLY_A,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_SOFTFAIL,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 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