From patchwork Sat Dec 7 00:32:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?5Yqg6Jek5LiA5Y2a?= X-Patchwork-Id: 11277209 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id DA7866C1 for ; Sat, 7 Dec 2019 00:32:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AE3D82245C for ; Sat, 7 Dec 2019 00:32:30 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=ksysllc.onmicrosoft.com header.i=@ksysllc.onmicrosoft.com header.b="Smn9UM7v" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726395AbfLGAc3 (ORCPT ); Fri, 6 Dec 2019 19:32:29 -0500 Received: from mail-eopbgr1310079.outbound.protection.outlook.com ([40.107.131.79]:4634 "EHLO APC01-SG2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726374AbfLGAc3 (ORCPT ); Fri, 6 Dec 2019 19:32:29 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AyZ/NELKZHXN6DK8gC2GzNSGYSNOOrFqIKbZWpWPGQ5cxAIY2srtLIqp76SBVoK5pc63ZU2F5g1S7Lz0JNGRF1d/nZX/AcF49NQ04cUIItLB+Xcw1aqBziGue8L6ol4T6th71H4jtYH8iq0+dIhcLf35Dmkn0vyWTkpbBG1tGfdxoCgEsSPEZX3a0ghYunIy4tCwhKQndIMU9rMK/fY0WyjAFX10rl6H5TLMpagBt7r0iJvlyCmWSGuD0lqteoTmKidyCKPh/76fw0T+ui7fABMUyVpdZ7u3ihn9tNvFPZtPcXOzFSXJrRJMTtKmVIoQ/EzdUG68Qq4CleGucrFIWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=hG4WCqXF1Dst0Yy6Hfl8vO1FzrK9N9NQcPNg44r+XT4=; b=n8VxshwvcyJLfeHQL1ZLC38PQJExNghgUM53D0+rZkCUh3gUtkyXVEV3Jx0gRaV7jW+FMvPcA3iCFnyc/+2XoKsuvdOiC0V31S/xuC0wA8HB0Ul8SxdzDvZdFvwPoO253gvMLg3KgW9DDna1DWPkdSlQ1SqQGtwO7uG6jEt2+5WkeFxZ+6Bqq3mdtLPySP6fG6eYO1etqqmaHCkj8dGuPQnVvMhrLBcMEj0r/tBiHgYopwZeAJU6K/2oRc97Lsf9Mtuu5V1EQ7SUAmJUNpMJLs0OzvmXkqlaUBThXfbGLNR1HYxMo1CZI6De7NtK1xVQNNbMo55FbW9chPU8QVHO1A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=ksysllc.co.jp; dmarc=pass action=none header.from=ksysllc.co.jp; dkim=pass header.d=ksysllc.co.jp; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ksysllc.onmicrosoft.com; s=selector2-ksysllc-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=hG4WCqXF1Dst0Yy6Hfl8vO1FzrK9N9NQcPNg44r+XT4=; b=Smn9UM7vLSac14bKMaqgWdnMjx1kVna1IQEwMNDHPKjQrcePmrlrK+rDVxtfwEqyTFs8C06C4LJ5LxJKEbpvrytaAWOG7SrR80OSzObR9P0zgLICK59JZKj0RCKFJPHngGuOjG9+zQJBabD4wJ+UNDClU5XmvhQ71H/hUR9drhg= Received: from TY2PR01MB2427.jpnprd01.prod.outlook.com (20.177.100.73) by TY2PR01MB3532.jpnprd01.prod.outlook.com (20.178.141.210) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2516.17; Sat, 7 Dec 2019 00:32:25 +0000 Received: from TY2PR01MB2427.jpnprd01.prod.outlook.com ([fe80::b074:84bd:8776:a29f]) by TY2PR01MB2427.jpnprd01.prod.outlook.com ([fe80::b074:84bd:8776:a29f%7]) with mapi id 15.20.2516.015; Sat, 7 Dec 2019 00:32:25 +0000 From: =?utf-8?b?5Yqg6Jek5LiA5Y2a?= To: "git@vger.kernel.org" CC: kazuhiro kato , =?utf-8?b?5Yqg6Jek5LiA5Y2a?= Subject: [PATCH] gitk: fix branch name encoding error on gitk Thread-Topic: [PATCH] gitk: fix branch name encoding error on gitk Thread-Index: AQHVrJXMazqV0th7Ckux+28wTk3POg== Date: Sat, 7 Dec 2019 00:32:25 +0000 Message-ID: <20191207003203.9612-1-kato-k@ksysllc.co.jp> Accept-Language: ja-JP, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: TYCPR01CA0012.jpnprd01.prod.outlook.com (2603:1096:405::24) To TY2PR01MB2427.jpnprd01.prod.outlook.com (2603:1096:404:7b::9) authentication-results: spf=none (sender IP is ) smtp.mailfrom=kato-k@ksysllc.co.jp; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.20.1.windows.1 x-originating-ip: [123.223.66.231] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 1a7f75e7-1ca9-4297-c6be-08d77aacee87 x-ms-traffictypediagnostic: TY2PR01MB3532:|TY2PR01MB3532: x-ld-processed: e2e801e1-1bfd-4c29-8e88-a6b5a79038d8,ExtAddr x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:6108; x-forefront-prvs: 0244637DEA x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(39830400003)(396003)(366004)(136003)(376002)(346002)(199004)(189003)(8676002)(6916009)(305945005)(6486002)(54906003)(316002)(5640700003)(6512007)(99286004)(52116002)(36756003)(1076003)(66556008)(64756008)(66476007)(66446008)(4744005)(66946007)(5660300002)(2616005)(26005)(508600001)(86362001)(102836004)(6506007)(107886003)(186003)(85182001)(4326008)(2906002)(71200400001)(1730700003)(81166006)(81156014)(71190400001)(8936002)(50226002);DIR:OUT;SFP:1101;SCL:1;SRVR:TY2PR01MB3532;H:TY2PR01MB2427.jpnprd01.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1; received-spf: None (protection.outlook.com: ksysllc.co.jp does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: cjwobV6A7msvC2PgXGTdL/4r5IqaD/lSiVFDUek+3JOH890RGxVDvdk3FE4hRmxrHOwcNjgfKHFmvBAKxspCPVceYCvpfORde3RlberAx1svxrvi/T/QRqYPjxol5RhANh1nnDdxacWTZWteFsg9PWZxuONhkYNS0R9LYe9xGSgfSwzs4wDP+NinIACBnulY0icJAfh7lgmVbY8UJfQvIBm8nps1quPmnq8kFzNO+10PYfXfNH2sT8Tp+9U/vCSDIQJ9ZSRRNtZNLs2Ze6IogDtJm+9iUm3vO0X53GsXV5IKMbg5DccVMGt5/wcMI96vu5AqlhJNNhv9PA/rN8prxlteRlxmPZyO8fCuJmuFXcI4Vx4FZ4s1W7fVZCxkXvEx8SY+L+cz62vz/6F+IIQcd3rHS3+fAd9IPqTXKyZD1kAyQ31OJE4We3e1NtVdeMSO Content-ID: <1106DCBB6E6DD94CB9E254A168A4B580@jpnprd01.prod.outlook.com> MIME-Version: 1.0 X-OriginatorOrg: ksysllc.co.jp X-MS-Exchange-CrossTenant-Network-Message-Id: 1a7f75e7-1ca9-4297-c6be-08d77aacee87 X-MS-Exchange-CrossTenant-originalarrivaltime: 07 Dec 2019 00:32:25.2392 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: e2e801e1-1bfd-4c29-8e88-a6b5a79038d8 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: hO18vvnCYsP6m1ZxLqFwhP+T36S4ZoHEXF4lWVyMAd1hg6HgT9prdr/Ob1BecX2eXNbmBHa9jROYXPJiVE1Pzg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: TY2PR01MB3532 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Kazuhiro Kato After "git checkout -b '漢字'" to create a branch with UTF-8 character in it, "gitk" shows the branch name incorrectly, as it forgets to turn the bytes read from the "git show-ref" command into Unicode characters. Signed-off-by: Kazuhiro Kato --- gitk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gitk b/gitk index abe4805..3f61a5b 100755 --- a/gitk +++ b/gitk @@ -1780,11 +1780,15 @@ proc readrefs {} { global otherrefids idotherrefs mainhead mainheadid global selecthead selectheadid global hideremotes + global tclencoding foreach v {tagids idtags headids idheads otherrefids idotherrefs} { unset -nocomplain $v } set refd [open [list | git show-ref -d] r] + if {$tclencoding != {}} { + fconfigure $refd -encoding $tclencoding + } while {[gets $refd line] >= 0} { if {[string index $line 40] ne " "} continue set id [string range $line 0 39]