From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-3.1 required=3.0 tests=AWL,BAYES_00,BODY_8BITS, DKIMWL_WL_MED,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id 5DF031F62E for ; Thu, 17 Jan 2019 11:04:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728478AbfAQLEe (ORCPT ); Thu, 17 Jan 2019 06:04:34 -0500 Received: from smtp-out-1.talktalk.net ([62.24.135.65]:17782 "EHLO smtp-out-1.talktalk.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728460AbfAQLEd (ORCPT ); Thu, 17 Jan 2019 06:04:33 -0500 Received: from [192.168.2.240] ([89.242.179.245]) by smtp.talktalk.net with SMTP id k5TIgq9p1whzSk5TIgTOKt; Thu, 17 Jan 2019 11:04:29 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=talktalk.net; s=cmr1711; t=1547723069; bh=JFKwzUZhp+QH0AescEuPPm5Y0jtA6nGMKbTFc0C09+g=; h=Reply-To:Subject:To:References:From:Date:In-Reply-To; b=WEX3W3om6xnHA0NJXTRVQiHItck14EIXwBsKPPSIqoTcuZIh7+fRy8RX1mogdT99V e5lxeWNIaxMyQbOBt1Sf+WuNcpl3KofsLeq099ShrX5QFU/I/LIsf8ce17NXNiUV10 ixvo9kY0scVIhbEL9NRvouvdfjA9XuavaskiT3To= X-Originating-IP: [89.242.179.245] X-Spam: 0 X-OAuthority: v=2.3 cv=e8Iot5h/ c=1 sm=1 tr=0 a=mXO2traYm5dwIDTImXRRDw==:117 a=mXO2traYm5dwIDTImXRRDw==:17 a=IkcTkHD0fZMA:10 a=HHGDD-5mAAAA:8 a=pGLkceISAAAA:8 a=yvH0ORhLAAAA:8 a=RdbUroKXAAAA:8 a=OEOMPt30AAAA:8 a=cUh97MXDAAAA:20 a=c8N2qxwPAAAA:8 a=kkXSrVyLAAAA:8 a=t1iREKK1AAAA:8 a=vGM4OC5ru7DOP1cQ4ToA:9 a=QEXdDO2ut3YA:10 a=avDSiMLFTVQA:10 a=g16NiAzxEZCYhzHwdYj3:22 a=enGQBRq35Lfor7j-KrOS:22 a=v4PQfO9bYglRLCrpL3Dl:22 a=z86bnWsfFWkCUr07FtHd:22 a=kWRtAMWQZpFwJH8yTbDI:22 a=GwMASsXFoBx4fiRzfQgc:22 Reply-To: phillip.wood@dunelm.org.uk Subject: Re: Broken interactive rebase text after some UTF-8 characters To: Michal Nowak , phillip.wood@dunelm.org.uk, git@vger.kernel.org References: <339d4dbd-b1bd-cf88-12b0-2af42f35ded7@talktalk.net> <23c60f2f-43ff-94ec-6100-861c655ec80b@startmail.com> From: Phillip Wood Message-ID: <8c43e31b-01d8-a1c5-d19c-8efd0e5c1714@talktalk.net> Date: Thu, 17 Jan 2019 11:04:28 +0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.3.3 MIME-Version: 1.0 In-Reply-To: <23c60f2f-43ff-94ec-6100-861c655ec80b@startmail.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-GB-large Content-Transfer-Encoding: 8bit X-CMAE-Envelope: MS4wfFcgbobAMAEZpISZgUgnzOe75Cutx4wg1GnKaV1hzaZJGhEQgH3lpWSQIypqT+x3r2nwcrUtPwVNcTsaNagYXme+ZZ/CM57qQePE22swwqgmULdvIa6v aBQVp5yR0J4s/Z/X8HLqVoQaGjPh7Fuz614aqMVyiTw1oY13Oah4Js9jlPcG3x+15vX6uqgq3+eULDfxKbfdjqzPZyVZrFhbww1FX9BO123Xr5j1trbtjcXD G72nFfgF/c7U1riysIaI8Q== Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Hi Michal On 16/01/2019 21:36, Michal Nowak wrote: > Hello Phillip, thanks for reaching out. > > This is what I see with your suggested command: > > > $ GIT_SEQUENCE_EDITOR=cat git rebase -i > 08487eea68a2fa501b5042131c6db068089f82e1 > hint: Waiting for your editor to close the file... pick 1ea94c756c 10202 > loader: use screen-#rows to find bottom left co-ordinates Reviewed by: > Toomas Soome Reviewed by: Gergő Mihály Doma > Approved by: Robert Mustacchi > p That's really weird, I'm not sure what's going on. One thing that would be useful would be to check whether the output of git log --pretty='%s' --reverse 08487eea68a2fa5.. includes the stray 'p' or not. I had a look through the configure output you attached to your previous mail and it seems you're building without iconv and gettext support, I've built git on linux with make NO_ICONV=1 NO_GETTEXT=1 to try and test that and the rebase todo list was fine. Building with configure rather than the Makefile that comes with git can be a bit flaky sometimes as occasionally when a new compile option gets added to the Makefile updating the configure script gets overlooked but I don't know if that is the problem here or not. Best Wishes Phillip > pick cadd68ea00 10078 smatch fixes for UCB Reviewed by: Andy Fiddaman > Reviewed by: Toomas Soome > Reviewed by: Peter Tribble Approved by: Robert > Mustacchi > pick 05ede3db5e 10079 smatch Makefile changes for usr/src/lib Reviewed > by: Andy Fiddaman Approved by: Robert Mustacchi > > pick 5661bb7641 10080 smatch Makefile changes for usr/src/cmd Reviewed > by: Andy Fiddaman Approved by: Robert Mustacchi > > pick 15c07adc1c 10081 smatch indenting fixes for usr/src/uts Reviewed > by: Toomas Soome Reviewed by: Peter Tribble > Reviewed by: Andy Fiddaman > Approved by: Robert Mustacchi > pick c653bb4713 10197 build smatch in parallel Reviewed by: Andy > Fiddaman Approved by: Robert Mustacchi > > # Rebase 08487eea68..c653bb4713 onto 08487eea68 (6 commands) > # > # Commands: > # p, pick = use commit > # r, reword = use commit, but edit the commit message > # e, edit = use commit, but stop for amending > # s, squash = use commit, but meld into previous commit > # f, fixup = like "squash", but discard this commit's log message > # x, exec = run command (the rest of the line) using shell > # b, break = stop here (continue rebase later with 'git rebase --continue') > # d, drop = remove commit > # l, label