From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from cc-smtpout3.netcologne.de (cc-smtpout3.netcologne.de [IPv6:2001:4dd0:100:1062:25:2:0:3]) by sourceware.org (Postfix) with ESMTPS id D47BA385802A for ; Sat, 16 Jan 2021 10:23:36 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org D47BA385802A Received: from cc-smtpin1.netcologne.de (cc-smtpin1.netcologne.de [89.1.8.201]) by cc-smtpout3.netcologne.de (Postfix) with ESMTP id 9381812912; Sat, 16 Jan 2021 11:23:34 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by cc-smtpin1.netcologne.de (Postfix) with ESMTP id 8EC3411E29; Sat, 16 Jan 2021 11:23:34 +0100 (CET) Received: from [2001:4dd7:2366:0:404f:fe14:e36c:a144] (helo=cc-smtpin1.netcologne.de) by localhost with ESMTP (eXpurgate 4.19.0) (envelope-from ) id 6002bea6-031e-7f0000012729-7f000001d44a-1 for ; Sat, 16 Jan 2021 11:23:34 +0100 Received: from linux-p51k.fritz.box (2001-4dd7-2366-0-404f-fe14-e36c-a144.ipv6dyn.netcologne.de [IPv6:2001:4dd7:2366:0:404f:fe14:e36c:a144]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by cc-smtpin1.netcologne.de (Postfix) with ESMTPSA; Sat, 16 Jan 2021 11:23:32 +0100 (CET) Subject: Re: Question on push To: Jerry DeLisle , fortran@gcc.gnu.org References: From: Thomas Koenig Message-ID: <8cedd393-ad70-6b22-e07e-1bad87937170@netcologne.de> Date: Sat, 16 Jan 2021 11:23:32 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.6.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: de-DE Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-4.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, NICE_REPLY_A, RCVD_IN_DNSWL_LOW, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: fortran@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Fortran mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Jan 2021 10:23:40 -0000 Hi Jerry, > I managed to push Harris patch regarding the ISO_Fortran_binding.c. > However it was a struggle. > > Naturally the push was rejected several times. Yes, the workflow that is not enforced by the scripts is really bad. There are a couple of things that you can to in advance, to save some of the pain. First, if you haven't already done so, run $ contrib/gcc-git-customization.sh This will set up a few useful aliases. Once you have done that, you have access to the command $ git gcc-verify which will do the checking locally. > As I was trying to > interpret the reasons given and go back and read the instructions, I was > given the impression that the behind the scenes process would ammend the > actual ChangeLog files for you. That is correct. The idea is to put the ChangeLog stuff into the commit message and it will then automagically be added to the ChangeLog files at a later date. > I have not seen this happen so to > clarify, There are two ChangeLog files involved. gcc/testsuite/ChangeLog > and libgfortran/ChangeLog. > > Do I make those changes locally and commit them?  (as I know we use to do!) The way that works for me is: (Change whatever I want to change) Change to the basic source directory of gcc git add . # Add all the changes git diff --cached # Is this really what I meant to do? git diff --cached > /tmp/p.txt # Create the patch git diff --cached | contrib/mklog.py > /tmp/ChangeLog # template emacs /tmp/ChangeLog # Edit the ChangeLog to say what it should say git commit I then insert /tmp/ChangeLog into the commit message git diff HEAD^1 # Check again git push > I also managed to forget to --author Harris on the push that went > through (In spite of Tobias reminding me to do so).  I was looking at > --amend and as far as I can tell, I can only change the tip of my local > repository before the push.  Is there a way to fix that out on the master? I think this is not possible. You can edit the ChangeLog afterwards (I don't know when the change is propagated there). When backporting (using git gcc-backport ) you can of course then use --amend to change things. (For this patch, it probably makes sense to backport). Hope this helps somewhat. Best regards Thomas