From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: git problems: >78 column commit message created by git revert. I'm stuck. What do I do? Date: Wed, 03 Oct 2018 09:46:54 -0400 Message-ID: References: <20181003124943.GA16238@ACM> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1538574346 29828 195.159.176.226 (3 Oct 2018 13:45:46 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Wed, 3 Oct 2018 13:45:46 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (gnu/linux) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Oct 03 15:45:42 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 1g7hTA-0007Xc-Ud for ged-emacs-devel@m.gmane.org; Wed, 03 Oct 2018 15:45:41 +0200 Original-Received: from localhost ([::1]:48865 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g7hVC-0004vZ-C6 for ged-emacs-devel@m.gmane.org; Wed, 03 Oct 2018 09:47:46 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:51970) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g7hUY-0004vJ-NZ for emacs-devel@gnu.org; Wed, 03 Oct 2018 09:47:07 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g7hUV-0005RL-Hl for emacs-devel@gnu.org; Wed, 03 Oct 2018 09:47:06 -0400 Original-Received: from [195.159.176.226] (port=33647 helo=blaine.gmane.org) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1g7hUV-0005Qg-A6 for emacs-devel@gnu.org; Wed, 03 Oct 2018 09:47:03 -0400 Original-Received: from list by blaine.gmane.org with local (Exim 4.84_2) (envelope-from ) id 1g7hSL-0006ba-23 for emacs-devel@gnu.org; Wed, 03 Oct 2018 15:44:49 +0200 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 22 Original-X-Complaints-To: usenet@blaine.gmane.org Cancel-Lock: sha1:074S9dlpFs8B2IMDyMu3a1ECXoM= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 195.159.176.226 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:230198 Archived-At: > I then did git pull --rebase. This failed with the message "Line longer > than 78 characters in commit message". The revert operation created log > messages with very long lines. :-( When you `git commit` you can skip the "78 char" check with `--no-verify`, but indeed, I can't see how to do the equivalent within `git pull --rebase` or `git rebase` (at least according to the manpage: `git rebase` has a `--no-verify` option as well, so maybe that will work, but the doc says it only affects the use of .git/hooks/pre-rebase). You can rm .git/hooks/commit-msg, tho. Also you can `git pull` without the `--rebase`. > However, I now have two unrebaseable commits in my repo, and it seems > likely the savannah server would reject them anyway. Those checks are only performed locally: the savannah server will happily accept commits that don't abide by those rules. Stefan