From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Po Lu Newsgroups: gmane.emacs.devel Subject: Re: master updated (18e7bc87521 -> c71a520d1da) Date: Mon, 07 Aug 2023 10:35:39 +0800 Message-ID: <87leen37gk.fsf@yahoo.com> References: <169136956945.2149.648813436805504636@vcs2.savannah.gnu.org> <87wmy737ld.fsf@yahoo.com> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="11310"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: emacs-devel@gnu.org To: Stefan Kangas Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Mon Aug 07 04:36:41 2023 Return-path: Envelope-to: ged-emacs-devel@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qSq6r-0002mD-96 for ged-emacs-devel@m.gmane-mx.org; Mon, 07 Aug 2023 04:36:41 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qSq69-00020f-65; Sun, 06 Aug 2023 22:35:57 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qSq64-00020F-6U for emacs-devel@gnu.org; Sun, 06 Aug 2023 22:35:52 -0400 Original-Received: from sonic313-10.consmr.mail.ne1.yahoo.com ([66.163.185.33]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qSq62-000270-1e for emacs-devel@gnu.org; Sun, 06 Aug 2023 22:35:51 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1691375746; bh=JQ/X6Y1Y2vQIShJVra2f0ZLPCXaTEC6/C1g80yfFQp8=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From:Subject:Reply-To; b=cB4fNef654ZurOJYZMmV3WMs8uxwec0TnttpaRg1iGIzcNE5TdNy/Cxd0RJn+W2b44rJaCnUDSim2hdNNidFR7WGz3oZ80E5OLqb6AlybqN3dilUHjL+HIyQ6Q6UJuLSDLArrZppXB2cBvJMNoJIEOqcgxUNBuz6vqyTY1w3OG0mLllUfH65KvYvg+VzIr61NfNPusms61I8FjHZJ7Za6HWCABukGoDaFMHgUds38P8CZ99VFxy6u5Tn78V/Y1ipyvWaLtcu0jnseyNd/4HYia3XbdzrHIp/DIrZym26WJinx8RfLwASm+myCsQ9ParYEuYchBBEUTf3xykYC6v+Gg== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1691375746; bh=LE5skyxicA32a3184tRW7NpRCMXv/OsnfmJyml0pjEE=; h=X-Sonic-MF:From:To:Subject:Date:From:Subject; b=P4G81hl8b64rxeHbvADQqM/WlenIqj5IZiorFqDHWqpEx7wSxnqERWJMQoEWvOFmm6y7kRDJpDDHBr4vMJbb1E+TztrEZbuBbPuvPPy5x5CJGLkTgc0i9R0fyma7nTVcbLYwnAnlZWuoOzZxVm6GJTBGhF51gxjpNXFH48PDhMdN7D9hUYcOusUqDLkU3QODVWbHHM/lES52us72HtfgAIZtsrkKT6f/iDwxqyF9ytnFfa19rWH5swv1cXUv3ZiXc4ouJgpZsEvPFH5Rd9BZZw8QPHefkBXhXRgKb+MkNZqXxDme7cBVtxU7Y6DhyKFrrPtqfh9DmzBnhK7v9VCVGg== X-YMail-OSG: 1iR1_rwVM1nawK0BireWU_f6aROLiicKcW2hq3nCBWHLlanhVM3cQ26Bbb7OE87 YFH0qfmj4w84sxGrwbKhyQfdrPKqWLC1LiT2H7c4Cw9AqpPUH5pxkcGiFDikFxk1TS6CPXLrhLPa 5H1KdiK3OCcWDtoUM.uvLY2SlDqYXQBKgD5NshcyPtUp3vs4oFghnAdpw2TUNx805iOGGkwZ5oRg ocEQpf4Ck48R9OXA2i72J1gl2QWqcdjOBdyw_rW_LOzfyK37klJm0u4W2zJnDIzXWFegewq_BJbb 5pqD2WusYyg7T2CEoHRDmqUXXx_Yzf.uOfyyn.YYH3wdIWIyGhWF6fwVhxVpsZpTG7n3YLBpn0Qw tvQkASHErdzNL76OfohYiOdWwO4rUhHVEhdi1RUoHJTfkzZ3tZOE4iRL2KiTt7Kg3jVx4Dvx.by. XFaNHnniAmLEvDL6ParF6HJ5rRRGlpfUKtYN7lsmWreVien36lVD4gm1BSqR15emPYCAFGep4JuN LO.L.gJQtQZN9JkniJcnDh2GT_JLN4nmdeqqleJnOFVpS_Jgoo2J5USx5XZoEWHVtcQXDwD.EatL PCuSMzFl5pQDRxWNG4iYjKl0iuC6N70MOdzZZJ7NRiG_OtGCmEBE3u8xjAKdfFbAtgC2BpffqUDB E_ek_Iy9qrVG6.mXsVwpaf5W2neFw_1V268DheiEaMWYadXeDWJMcpZO4lxy2.FoWf5Kkae4KjGI RXwsPhPfONkA6mK.E.klTOMk1tbh.hxufqQdX90Ctn5tHKmDAhaPG9cxjoh5j_lroakzB48w7tpN jo2tK_sXxWReT6NHzT0vRvv5gJb_cfUc7mIvdAbZX6 X-Sonic-MF: X-Sonic-ID: dd425db4-24bf-4c6e-a390-a610a56e1c63 Original-Received: from sonic.gate.mail.ne1.yahoo.com by sonic313.consmr.mail.ne1.yahoo.com with HTTP; Mon, 7 Aug 2023 02:35:46 +0000 Original-Received: by hermes--production-sg3-6b8fc8d58f-zs8lh (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID 343f3da248f3bea2de5a2550b5aea701; Mon, 07 Aug 2023 02:35:44 +0000 (UTC) In-Reply-To: <87wmy737ld.fsf@yahoo.com> (Po Lu's message of "Mon, 07 Aug 2023 10:32:46 +0800") X-Mailer: WebService/1.1.21695 mail.backend.jedi.jws.acl:role.jedi.acl.token.atz.jws.hermes.yahoo Received-SPF: pass client-ip=66.163.185.33; envelope-from=luangruo@yahoo.com; helo=sonic313-10.consmr.mail.ne1.yahoo.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.devel:308397 Archived-At: [Resending with emacs-devel copied in, sorry.] Stefan Kangas writes: > Did you follow the procedure documented in > admin/doc/git-merge-workflow when doing this merge? Where is this file, and what does it say? > It looks to me like you merged master into feature/android and then > pushed that to master, or something along those lines? Yes. > I'm seeing that files have their > > git log > > littered with incorrect (and distracting) commits saying > > Merge remote-tracking branch 'origin/master' into feature/android > > This has not happened for any other feature branch (well, except pgtk, > but it is too late to change that). AFAIU, the ChangeLog generator ignores commits made on branches merged into master, and only refers to the commit message for the merge commit itself. > AFAICT, we see commits like the above when the merge takes place after > the files were first changed on features/android and then [every time > they are changed] on master. In other words, they are displayed on > master now in the way you would expect on feature/android. See "git > log lisp/startup.el" for an example of what it looks like - not good. How can this be avoided? I merely ran: $ git merge --edit --no-ff feature/android within a checkout of master; the --no-ff was necessary for supplying a ChangeLog entry for the merge itself. > Merge commits _from_ master should not be displayed, as they only > serve to make history less readable. That's why git hides them there > by default after you merge said branch to master. On the other hand we > are, of course, interested in when feature/android was merged into > master. But that is _not_ currently visible in "git log ". > > I recommend force pushing a correct merge to master before it is too > late to reverse this. That's totally fine by me, but alas, you have not told me how to perform this procedure. (And I can't find a file named git-merge-workflow anywhere.)