From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.bugs Subject: bug#19113: Generate a ChangeLog file from commit logs Date: Fri, 05 Dec 2014 10:38:08 +0200 Message-ID: <8361dq4hlb.fsf@gnu.org> References: <546D2E75.6090701@cs.ucla.edu> <837fyp7tvi.fsf@gnu.org> <546E2899.4050702@cs.ucla.edu> <54756754.5090103@cs.ucla.edu> <54762721.4060908@cs.ucla.edu> <17zjb2h650.fsf@fencepost.gnu.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1417768706 10642 80.91.229.3 (5 Dec 2014 08:38:26 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 5 Dec 2014 08:38:26 +0000 (UTC) Cc: 19113@debbugs.gnu.org, eggert@cs.ucla.edu To: Glenn Morris Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Fri Dec 05 09:38:19 2014 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1XwoP1-00028G-5a for geb-bug-gnu-emacs@m.gmane.org; Fri, 05 Dec 2014 09:38:15 +0100 Original-Received: from localhost ([::1]:49268 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XwoP0-0005tg-Pk for geb-bug-gnu-emacs@m.gmane.org; Fri, 05 Dec 2014 03:38:14 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:37588) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XwoOt-0005sg-Ck for bug-gnu-emacs@gnu.org; Fri, 05 Dec 2014 03:38:12 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XwoOo-0002Yd-72 for bug-gnu-emacs@gnu.org; Fri, 05 Dec 2014 03:38:07 -0500 Original-Received: from debbugs.gnu.org ([140.186.70.43]:57037) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XwoOo-0002YW-4e for bug-gnu-emacs@gnu.org; Fri, 05 Dec 2014 03:38:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1XwoOn-0002Ey-Ok for bug-gnu-emacs@gnu.org; Fri, 05 Dec 2014 03:38:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 05 Dec 2014 08:38:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 19113 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 19113-submit@debbugs.gnu.org id=B19113.14177686788600 (code B ref 19113); Fri, 05 Dec 2014 08:38:01 +0000 Original-Received: (at 19113) by debbugs.gnu.org; 5 Dec 2014 08:37:58 +0000 Original-Received: from localhost ([127.0.0.1]:54250 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XwoOj-0002Ee-If for submit@debbugs.gnu.org; Fri, 05 Dec 2014 03:37:57 -0500 Original-Received: from mtaout20.012.net.il ([80.179.55.166]:33105) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XwoOg-0002ET-Gf for 19113@debbugs.gnu.org; Fri, 05 Dec 2014 03:37:55 -0500 Original-Received: from conversion-daemon.a-mtaout20.012.net.il by a-mtaout20.012.net.il (HyperSendmail v2007.08) id <0NG300C00PA03N00@a-mtaout20.012.net.il> for 19113@debbugs.gnu.org; Fri, 05 Dec 2014 10:37:52 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout20.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NG300BERPB3X640@a-mtaout20.012.net.il>; Fri, 05 Dec 2014 10:37:52 +0200 (IST) In-reply-to: <17zjb2h650.fsf@fencepost.gnu.org> X-012-Sender: halo1@inter.net.il X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 140.186.70.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:96882 Archived-At: > From: Glenn Morris > Date: Fri, 05 Dec 2014 03:07:07 -0500 > Cc: 19113@debbugs.gnu.org > > 4) What if I commit something, realize it was wrong, and remove it right > away? Normally I'd delete the ChangeLog entry too. With Git, it's useful to distinguish between "commit" and "push". The former can be easily fixed, since it's still only in your local clone; use "git amend" or even "git reset". The latter cannot be fixed, except by running Git commands on Savannah that work directly on the public repository, which is generally frowned upon, because others could have pulled in-between. > 6) How does the correction method work (I'm being lazy and not reading > the patch). >From "gitlog-to-changelog --help: --amend=FILE FILE maps from an SHA1 to perl code (i.e., s/old/new/) that makes a change to SHA1's commit log text or metadata. [...] In a FILE specified via --amend, comment lines (starting with "#") are ignored. FILE must consist of pairs where SHA is a 40-byte SHA1 (alone on a line) referring to a commit in the current project, and CODE refers to one or more consecutive lines of Perl code. Pairs must be separated by one or more blank line. Here is sample input for use with --amend=FILE, from coreutils: 3a169f4c5d9159283548178668d2fae6fced3030 # fix typo in title: s/all tile types/all file types/ 1379ed974f1fa39b12e2ffab18b3f7a607082202 # Due to a bug in vc-dwim, I mis-attributed a patch by Paul to myself. # Change the author to be Paul. Note the escaped "@": s,Jim .*>,Paul Eggert ,