From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Ken Brown Newsgroups: gmane.emacs.devel Subject: make change-history Date: Sun, 29 Jul 2018 12:17:10 -0400 Message-ID: NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit X-Trace: blaine.gmane.org 1532880954 15620 195.159.176.226 (29 Jul 2018 16:15:54 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Sun, 29 Jul 2018 16:15:54 +0000 (UTC) User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 To: Emacs Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Jul 29 18:15:50 2018 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fjoMI-0003xH-Dm for ged-emacs-devel@m.gmane.org; Sun, 29 Jul 2018 18:15:50 +0200 Original-Received: from localhost ([::1]:48967 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fjoOO-0006aB-WA for ged-emacs-devel@m.gmane.org; Sun, 29 Jul 2018 12:18:01 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:52754) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fjoNj-0006Zv-Ms for emacs-devel@gnu.org; Sun, 29 Jul 2018 12:17:20 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fjoNe-0002Po-Po for emacs-devel@gnu.org; Sun, 29 Jul 2018 12:17:19 -0400 Original-Received: from limerock02.mail.cornell.edu ([128.84.13.242]:41749) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fjoNe-0002Pe-K2 for emacs-devel@gnu.org; Sun, 29 Jul 2018 12:17:14 -0400 X-CornellRouted: This message has been Routed already. Original-Received: from authusersmtp.mail.cornell.edu (granite3.serverfarm.cornell.edu [10.16.197.8]) by limerock02.mail.cornell.edu (8.14.4/8.14.4_cu) with ESMTP id w6TGHDnE006573 for ; Sun, 29 Jul 2018 12:17:13 -0400 Original-Received: from [192.168.0.15] (mta-68-175-129-7.twcny.rr.com [68.175.129.7] (may be forged)) (authenticated bits=0) by authusersmtp.mail.cornell.edu (8.14.4/8.12.10) with ESMTP id w6TGHCqx020242 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NOT) for ; Sun, 29 Jul 2018 12:17:13 -0400 Content-Language: en-US X-PMX-Cornell-Gauge: Gauge=XXXXX X-PMX-CORNELL-AUTH-RESULTS: dkim-out=none; X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x [fuzzy] X-Received-From: 128.84.13.242 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.21 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.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.org gmane.emacs.devel:227949 Archived-At: I'd like to update ChangeLog.3 so that I can fix a typo in a commit message. The commit was made on master. According to the last sentence of admin/notes/repo, I'm supposed to run 'make change-history'. But this doesn't currently work when master is checked out: $ make change-history git branch | grep -q '^\* emacs-26$' make: *** [Makefile:1125: preferred-branch-is-current] Error 1 Can someone tell me how to deal with this (and/or update the instructions in admin/notes/repo)? Thanks. Ken