From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-3.9 required=3.0 tests=AWL,BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI shortcircuit=no autolearn=ham autolearn_force=no version=3.4.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id 990861F453 for ; Mon, 24 Sep 2018 01:29:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726497AbeIXHXi (ORCPT ); Mon, 24 Sep 2018 03:23:38 -0400 Received: from cloud.peff.net ([104.130.231.41]:56840 "HELO cloud.peff.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1725981AbeIXHXi (ORCPT ); Mon, 24 Sep 2018 03:23:38 -0400 Received: (qmail 32534 invoked by uid 109); 24 Sep 2018 01:23:56 -0000 Received: from Unknown (HELO peff.net) (10.0.1.2) by cloud.peff.net (qpsmtpd/0.94) with SMTP; Mon, 24 Sep 2018 01:23:56 +0000 Authentication-Results: cloud.peff.net; auth=none Received: (qmail 21942 invoked by uid 111); 24 Sep 2018 01:23:42 -0000 Received: from sigill.intra.peff.net (HELO sigill.intra.peff.net) (10.0.0.7) by peff.net (qpsmtpd/0.94) with (ECDHE-RSA-AES256-GCM-SHA384 encrypted) SMTP; Sun, 23 Sep 2018 21:23:42 -0400 Authentication-Results: peff.net; auth=none Received: by sigill.intra.peff.net (sSMTP sendmail emulation); Sun, 23 Sep 2018 21:23:54 -0400 Date: Sun, 23 Sep 2018 21:23:54 -0400 From: Jeff King To: Stas Bekman Cc: Git Mailing List Subject: Re: git diff-tree ignores --textconv Message-ID: <20180924012354.GA27439@sigill.intra.peff.net> References: <41cd358c-d900-2996-b78a-b9d897a2ba2b@stason.org> <20180924004307.GA26103@sigill.intra.peff.net> <13dec8d3-b164-dc24-45e0-8e1bbd550524@stason.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <13dec8d3-b164-dc24-45e0-8e1bbd550524@stason.org> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org On Sun, Sep 23, 2018 at 05:56:03PM -0700, Stas Bekman wrote: > > You probably want "--ext-diff", not "--textconv". > [...] > Would it be safe to ask the maintainer of the application to include > both --textconv and --ext-diff in that 'git diff-tree' call? I only need > the latter, but someone needed --textconv there as it's in the code. I think so. The main reason that they are not the default for plumbing commands such as diff-tree is that the output may be quite surprising to anything trying to parse the output. Using --textconv will always produce a diff, but one that may not be applied to the original content. Using --ext-diff may produce output that doesn't even look like a diff, though in practice they often do. > This is for this package: > https://github.com/rsmmr/git-notifier It looks like the output is meant to be read by humans, so yeah, I think it would be fine (and preferred) to enable both. -Peff