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.6 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, 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 E6B491F45F for ; Fri, 10 May 2019 20:53:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727997AbfEJUxv (ORCPT ); Fri, 10 May 2019 16:53:51 -0400 Received: from mail-pg1-f195.google.com ([209.85.215.195]:44126 "EHLO mail-pg1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727868AbfEJUxu (ORCPT ); Fri, 10 May 2019 16:53:50 -0400 Received: by mail-pg1-f195.google.com with SMTP id z16so3542143pgv.11 for ; Fri, 10 May 2019 13:53:49 -0700 (PDT) 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=1JFNPxxyZB4kVXzQy3V89/liG2lhExu3ZqrZ1YpAFkc=; b=TnwE3cWzWi93Ouwqay+137/J9VY4tu7MYa+5MVACTgI8gT68+DviF+OG2NTkO8OfeG uyBXgkn5qTlmpeyd2Zxraku9YYsg7T9KdIGDHSOMaC/ToeAA2oYRpDoKFf3B5MLhukjJ aXZIS60SeiuhjRB94sU9vn4clq0H/u+c3nZ3kz3h+vQqkHTwWVMkLeqWtHjSJfNxPfzL 3986lAKNDm0XJTZATeWZEC6qYiGUWL55kjjRO+adSf3HSv7nL+oWU+4ig9OznDavnz7p dTpDpSsSZGwstce83N/aPwHf88xwzplhBwwM29Iy8qUeMfhYJ4GNUMvbnC5KUQ1P5j0g CWMA== 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=1JFNPxxyZB4kVXzQy3V89/liG2lhExu3ZqrZ1YpAFkc=; b=EaFbD6zYfVzldHmkV4Z/KGAmx+WnumNGu5X8F62pFcSZAg6u5osUKLT22dVYtyVUkv r/QQr5Dlh1UWojijbiMZ3JOSkHe7dH55dVVRfFhfyR9alETeuqU6op7DZzEflmw420Hh 6U7gu5XegZ7lXqRP0PYR/ZZtY7FK8p7AE+hb7uwZWotxXiAV4IQVO/I/AWTfoNWO2b/7 /wg5OFiCbGqdon+4EMt1x9j3dU8neG/UVCOGEcC9sz4jdhGhEo/PLl+L16tiKtOV1gF/ dcmsedPMPK+djhEDo6+gajpwfN0ud71VtB6aKyfEV4ZzNNIRlimTaiLYmpyY46PtfPoY L3Wg== X-Gm-Message-State: APjAAAV3JzwDADe9SBpow4XEwURWX/0sc9iOkZYnET57RT/kSu+NsR0H WpeNRnjUWhLLxTQUML7PTAQ= X-Google-Smtp-Source: APXvYqyQtP3+ytkfMjrIeGDUmTPKwD1g/eg4EqSQzEdoSd3bk9YdQ5euHzk3FgprHffIWcKZ8lodIQ== X-Received: by 2002:a62:1a8b:: with SMTP id a133mr16746754pfa.87.1557521629259; Fri, 10 May 2019 13:53:49 -0700 (PDT) Received: from newren2-linux.yojoe.local ([8.4.231.67]) by smtp.gmail.com with ESMTPSA id n127sm7305142pga.57.2019.05.10.13.53.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 10 May 2019 13:53:48 -0700 (PDT) From: Elijah Newren To: gitster@pobox.com Cc: git@vger.kernel.org, Eric Sunshine , Johannes Schindelin , Johannes Sixt , Elijah Newren Subject: [PATCH v3 2/5] fast-import: support 'encoding' commit header Date: Fri, 10 May 2019 13:53:32 -0700 Message-Id: <20190510205335.19968-3-newren@gmail.com> X-Mailer: git-send-email 2.21.0.782.g2063122293 In-Reply-To: <20190510205335.19968-1-newren@gmail.com> References: <20190430182523.3339-1-newren@gmail.com> <20190510205335.19968-1-newren@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Since git supports commit messages with an encoding other than utf-8, allow fast-import to import such commits. This may be useful for folks who do not want to reencode commit messages from an external system, and may also be useful to achieve reversible history rewrites (e.g. sha1sum <-> sha256sum transitions or subtree work) with git repositories that have used specialized encodings in their commit history. Signed-off-by: Elijah Newren --- Documentation/git-fast-import.txt | 7 +++++++ fast-import.c | 11 +++++++++-- t/t9300-fast-import.sh | 20 ++++++++++++++++++++ 3 files changed, 36 insertions(+), 2 deletions(-) diff --git a/Documentation/git-fast-import.txt b/Documentation/git-fast-import.txt index d65cdb3d08..7baf9e47b5 100644 --- a/Documentation/git-fast-import.txt +++ b/Documentation/git-fast-import.txt @@ -388,6 +388,7 @@ change to the project. original-oid? ('author' (SP )? SP LT GT SP LF)? 'committer' (SP )? SP LT GT SP LF + ('encoding' SP )? data ('from' SP LF)? ('merge' SP LF)? @@ -455,6 +456,12 @@ that was selected by the --date-format= command-line option. See ``Date Formats'' above for the set of supported formats, and their syntax. +`encoding` +^^^^^^^^^^ +The optional `encoding` command indicates the encoding of the commit +message. Most commits are UTF-8 and the encoding is omitted, but this +allows importing commit messages into git without first reencoding them. + `from` ^^^^^^ The `from` command is used to specify the commit to initialize diff --git a/fast-import.c b/fast-import.c index f38d04fa58..76a7bd3699 100644 --- a/fast-import.c +++ b/fast-import.c @@ -2585,6 +2585,7 @@ static void parse_new_commit(const char *arg) struct branch *b; char *author = NULL; char *committer = NULL; + const char *encoding = NULL; struct hash_list *merge_list = NULL; unsigned int merge_count; unsigned char prev_fanout, new_fanout; @@ -2607,6 +2608,8 @@ static void parse_new_commit(const char *arg) } if (!committer) die("Expected committer but didn't get one"); + if (skip_prefix(command_buf.buf, "encoding ", &encoding)) + read_next_command(); parse_data(&msg, 0, NULL); read_next_command(); parse_from(b); @@ -2670,9 +2673,13 @@ static void parse_new_commit(const char *arg) } strbuf_addf(&new_data, "author %s\n" - "committer %s\n" - "\n", + "committer %s\n", author ? author : committer, committer); + if (encoding) + strbuf_addf(&new_data, + "encoding %s\n", + encoding); + strbuf_addch(&new_data, '\n'); strbuf_addbuf(&new_data, &msg); free(author); free(committer); diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh index 3668263c40..141b7fa35e 100755 --- a/t/t9300-fast-import.sh +++ b/t/t9300-fast-import.sh @@ -3299,4 +3299,24 @@ test_expect_success !MINGW 'W: get-mark & empty orphan commit with erroneous thi sed -e s/LFs/LLL/ W-input | tr L "\n" | test_must_fail git fast-import ' +### +### series X (other new features) +### + +test_expect_success 'X: handling encoding' ' + test_tick && + cat >input <<-INPUT_END && + commit refs/heads/encoding + committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE + encoding iso-8859-7 + data <>input && + + git fast-import