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: AS3215 2.6.0.0/16 X-Spam-Status: No, score=-3.5 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,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from out1.vger.email (out1.vger.email [IPv6:2620:137:e000::1:20]) by dcvr.yhbt.net (Postfix) with ESMTP id E53FE1F54E for ; Wed, 24 Aug 2022 21:22:01 +0000 (UTC) Authentication-Results: dcvr.yhbt.net; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="nys0il+r"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238348AbiHXVV5 (ORCPT ); Wed, 24 Aug 2022 17:21:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58252 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232229AbiHXVV4 (ORCPT ); Wed, 24 Aug 2022 17:21:56 -0400 Received: from mail-wr1-x42b.google.com (mail-wr1-x42b.google.com [IPv6:2a00:1450:4864:20::42b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EDEAE165B7 for ; Wed, 24 Aug 2022 14:21:54 -0700 (PDT) Received: by mail-wr1-x42b.google.com with SMTP id bs25so22294667wrb.2 for ; Wed, 24 Aug 2022 14:21:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc; bh=Od1kbTidoOdNpH0yOTDDO7vO4r9QtkStjTB2a95SYxc=; b=nys0il+rSoIDWOzpQxVlNE5tTlhE3xmQ5hjzbG9p4Co1A7lbCJL+6D4zZNoB52agnB +plzVxBEQE8/3A+PmQn0qVts//HZwbN/ithQ8/fag8AvBSy+aCZ/tUNWYA0WovkeX7Oi 7Aj0b8QS3H0BlgcRXN59n9dz85Fz2XxSwAjLqvAQZWr44vAANCouoalOs8931J9x8q02 NCzzQE3RgZ1qMQt36NXA6gBTR2TKZjT6DGulEpup1K5y4MgDB/Krf5sEi4J/D4jBfxJl MAf9Vb3vCt/rucmCDBSS9TGFQ7GYz3xNg7Truo8/LAxz3eJUZYkntBz4NHtlo1jiBnW5 uMuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc; bh=Od1kbTidoOdNpH0yOTDDO7vO4r9QtkStjTB2a95SYxc=; b=OpJmP66m3zfyI2PhzR2vtuNbAb756vBCYmtw0NOTshyjDFbG6re1Z+8S4Ov1dZ4eag Tr6qSLhdVw+FcE5/PC1A2pE8BwtSUPGUdAqnGwiDB1tbf1S6NYIk5LLJiUV9eKdkbWVl PIojMuEhusWlDwqdPsEi6qAxCENZRulvDq/4giYa2JOv2wyTsxGq9MaZLudVNPJpt0EL fnYSjUTjbEubChKIchk+MeFze69IpYVfiifdNr6LvLgUBdaAmb6yNSnXH7lhFD/Tx97G HE2ZwLmHHyrzOmmm+XrVJl1unoOI3SFQDj1GM+4MVSz0Lmcnh4Fumpt0LzTD8KOjTssA 5Sqw== X-Gm-Message-State: ACgBeo2Z/uVvcjeWBe+VRp0OGLJXkbxOtS+lzuUbpDoQKWVZzIfBb2+y Hra/LthNob3bfVA0b6G2IoMYoUdWi3Y= X-Google-Smtp-Source: AA6agR5dnTz5A7r3U3vR1IIAdF4umsnt2bPTq+0IAW45OQ90wDL/ltzopf9tmfxtDlwjlXL8XQ6guA== X-Received: by 2002:a5d:6712:0:b0:225:337c:3889 with SMTP id o18-20020a5d6712000000b00225337c3889mr512479wru.59.1661376113131; Wed, 24 Aug 2022 14:21:53 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id r17-20020a05600c35d100b003a1980d55c4sm2994515wmq.47.2022.08.24.14.21.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Aug 2022 14:21:52 -0700 (PDT) Message-Id: In-Reply-To: References: From: "Johannes Schindelin via GitGitGadget" Date: Wed, 24 Aug 2022 21:21:47 +0000 Subject: [PATCH v2 0/4] built-in add -p: support diff-so-fancy better Fcc: Sent Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit MIME-Version: 1.0 To: git@vger.kernel.org Cc: Philippe Blain , Johannes Schindelin Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Philippe Blain reported in https://lore.kernel.org/git/ecf6f5be-22ca-299f-a8f1-bda38e5ca246@gmail.com that there is a problem when running the built-in version of git add -p with diff-so-fancy [https://github.com/so-fancy/diff-so-fancy] as diff colorizer. The symptom is this: error: could not parse colored hunk header '?[36m?[1m?[38;5;13m@ file:1 @?[1m?[0m' This patch series addresses that and should fix https://github.com/so-fancy/diff-so-fancy/issues/437 Changes since v1: * Added a commit to ignore dirty submodules just like the Perl version does. Johannes Schindelin (4): t3701: redefine what is "bogus" output of a diff filter add -p: gracefully ignore unparseable hunk headers in colored diffs add -p: handle `diff-so-fancy`'s hunk headers better add -p: ignore dirty submodules add-patch.c | 24 ++++++++++++++---------- t/t3701-add-interactive.sh | 24 +++++++++++++++++++++++- 2 files changed, 37 insertions(+), 11 deletions(-) base-commit: 795ea8776befc95ea2becd8020c7a284677b4161 Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1336%2Fdscho%2Fdiff-so-fancy-v2 Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1336/dscho/diff-so-fancy-v2 Pull-Request: https://github.com/gitgitgadget/git/pull/1336 Range-diff vs v1: 1: 74ab50eeb1c = 1: 74ab50eeb1c t3701: redefine what is "bogus" output of a diff filter 2: b07f85a0359 = 2: b07f85a0359 add -p: gracefully ignore unparseable hunk headers in colored diffs 3: 9dac9f74d2e = 3: 9dac9f74d2e add -p: handle `diff-so-fancy`'s hunk headers better -: ----------- > 4: 540ce27c38a add -p: ignore dirty submodules -- gitgitgadget