From patchwork Mon Nov 11 06:03:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?xJBvw6BuIFRy4bqnbiBDw7RuZyBEYW5o?= X-Patchwork-Id: 11236601 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 981C41747 for ; Mon, 11 Nov 2019 06:04:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 76E0C2084F for ; Mon, 11 Nov 2019 06:04:28 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="LwE2Xa9u" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726965AbfKKGE1 (ORCPT ); Mon, 11 Nov 2019 01:04:27 -0500 Received: from mail-pf1-f194.google.com ([209.85.210.194]:34459 "EHLO mail-pf1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726923AbfKKGE0 (ORCPT ); Mon, 11 Nov 2019 01:04:26 -0500 Received: by mail-pf1-f194.google.com with SMTP id n13so9974062pff.1 for ; Sun, 10 Nov 2019 22:04:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9NniXLoxW9Lgi4XgbeMQKMLTukToMqqx89//Cnr+Tqw=; b=LwE2Xa9uUd4AIn5ExBYaLOz2sBD6JePoh2ghgCrV3LKHjIvAPCPr60esR7w8YAGjv5 zYiqoxZLBY9QXHLYZjFPFNiRte1MK4RDLVwA6dIRQOD+ERBmNK0xjtSkmb/p7uuIHrOx kr3RqZxsV+ZTQI8jC39xVzgvWLBJdAU67g4DiAUOo+ggj6ioQtlNbPB6/psZ7epmG5qI Y2jJulupaUYJH07cl1+n600JSpnSh8UCrSi3ZNj4SJIF3UYR6vLcN4KT66iXdBAbG6KT hnz3UuXe6dVawBfkX+ROGdUnhk7BvNVUOpP55GKquiD/nTjmzuJnm96F3yvmLhtdYXLk 11Tw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9NniXLoxW9Lgi4XgbeMQKMLTukToMqqx89//Cnr+Tqw=; b=m6rxqMWZ2SeEeoMeI8G8kjqnNvIJsvwOEZv5Jbd4TkLBHUERu1ml1D43xxXiUoPTQv dNau7efcCcaUeRgAG4kSQ1+hTApQb+ycsMM+vrscGrVnMbU2tHiL+Iaf8OT4pO3YzGlA XG1GcA6NUTZIuluNsrk9q74zS4fhd+lGTvc+J+xnonMS+LhML5tNreeHVWOIldAY0ILE XxZeVxg5p/ZpZ/Yi0OyRFYWom+H2btH7kh39TXf1h0avXV1qmzbmaQ0seJHmhn1S5XV+ +IAaNMlBnvwLMfNdrRFLK4i+jlUSYctZlVrgjoYVgE6LyRZdY1tTRG9vfbyfzCDIcoqL ogxA== X-Gm-Message-State: APjAAAV8tFHIvX+RNWFijfXCkoxZ1sQquxy9P78myaPgrjNH2UT14sAG Lcn5wPfUN4vBRx/qkcCCSK6N0Otn X-Google-Smtp-Source: APXvYqzIi74Wz8xMR+NFC1keORvD84sp8/6YcFb7fiRhy+iNivXQzPk7C9YoXs4ILUo4GCi7jqmdXw== X-Received: by 2002:a17:90a:c004:: with SMTP id p4mr27698290pjt.104.1573452264038; Sun, 10 Nov 2019 22:04:24 -0800 (PST) Received: from localhost.localdomain ([2402:800:6375:16b7:502d:9b82:436:143a]) by smtp.gmail.com with ESMTPSA id v16sm15112315pje.1.2019.11.10.22.04.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 10 Nov 2019 22:04:23 -0800 (PST) From: Doan Tran Cong Danh To: git@vger.kernel.org Cc: peff@peff.net, gitster@pobox.com, Doan Tran Cong Danh Subject: [PATCH v6 7/9] sequencer: reencode old merge-commit message Date: Mon, 11 Nov 2019 13:03:40 +0700 Message-Id: <4dfdd4b83ed0cf59ae1a4e888ba1f7e4c7d1f80f.1573452046.git.congdanhqx@gmail.com> X-Mailer: git-send-email 2.24.0.164.g78daf050de.dirty In-Reply-To: References: <20191031092618.29073-1-congdanhqx@gmail.com> MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org During rebasing, old merge's message (encoded in old encoding) will be used as message for new merge commit (created by rebase). In case of the value of i18n.commitencoding has been changed after the old merge time. We will receive an unusable message for this new merge. Correct it. This change also notice a breakage with git-rebase label system. Signed-off-by: Doan Tran Cong Danh --- sequencer.c | 3 ++- t/t3434-rebase-i18n.sh | 57 +++++++++++++++++++++++++++++++++++++++++ t/t3434/eucJP.txt | Bin 0 -> 68 bytes 3 files changed, 59 insertions(+), 1 deletion(-) create mode 100755 t/t3434-rebase-i18n.sh create mode 100644 t/t3434/eucJP.txt GIT binary patch literal 68 zcmZ2-e#x69mzLaKa+Ql~$@V43mMmHFddayZYZfkovW_oY%ys|3$+JKuZexpect && + git cat-file commit HEAD >raw && + sed "1,/^$/d" raw >actual && + test_cmp expect actual +} + +test_expect_success setup ' + test_commit one && + git branch first && + test_commit two && + git switch first && + test_commit three && + git branch second && + test_commit four && + git switch second && + test_commit five && + test_commit six +' + +test_expect_success 'rebase --rebase-merges update encoding eucJP to UTF-8' ' + git switch -c merge-eucJP-UTF-8 first && + git config i18n.commitencoding eucJP && + git merge -F "$TEST_DIRECTORY/t3434/eucJP.txt" second && + git config i18n.commitencoding UTF-8 && + git rebase --rebase-merges master && + compare_msg eucJP.txt eucJP UTF-8 +' + +test_expect_failure 'rebase --rebase-merges update encoding eucJP to ISO-2022-JP' ' + git switch -c merge-eucJP-ISO-2022-JP first && + git config i18n.commitencoding eucJP && + git merge -F "$TEST_DIRECTORY/t3434/eucJP.txt" second && + git config i18n.commitencoding ISO-2022-JP && + git rebase --rebase-merges master && + compare_msg eucJP.txt eucJP ISO-2022-JP +' + +test_done diff --git a/t/t3434/eucJP.txt b/t/t3434/eucJP.txt new file mode 100644 index 0000000000000000000000000000000000000000..546f2aac01b67e39d19de601f5586097b34a8325