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: AS53758 23.128.96.0/24 X-Spam-Status: No, score=-5.0 required=3.0 tests=AWL,BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,NICE_REPLY_A, RCVD_IN_DNSWL_MED,SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by dcvr.yhbt.net (Postfix) with ESMTP id B216F1F8C8 for ; Fri, 17 Sep 2021 16:59:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242276AbhIQRAV (ORCPT ); Fri, 17 Sep 2021 13:00:21 -0400 Received: from smtp.hosts.co.uk ([85.233.160.19]:54786 "EHLO smtp.hosts.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237058AbhIQRAV (ORCPT ); Fri, 17 Sep 2021 13:00:21 -0400 Received: from host-84-13-154-214.opaltelecom.net ([84.13.154.214] helo=[192.168.1.37]) by smtp.hosts.co.uk with esmtpa (Exim) (envelope-from ) id 1mRHCS-000Byw-Fm; Fri, 17 Sep 2021 17:58:57 +0100 Subject: Re: diff-index --cc no longer permitted, gitk is now broken (slightly) To: Sergey Organov , Junio C Hamano Cc: Johannes Sixt , Jeff King , Paul Mackerras , Git Mailing List References: <87h7f4tf0b.fsf@osv.gnss.ru> <87pmtjkwsj.fsf@osv.gnss.ru> <87sfy497ed.fsf@osv.gnss.ru> <874kaki1nb.fsf@osv.gnss.ru> <87bl4rk7bh.fsf@osv.gnss.ru> From: Philip Oakley Message-ID: <61ffe5ee-dcc9-4308-7ced-430c3891e898@iee.email> Date: Fri, 17 Sep 2021 17:58:55 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.14.0 MIME-Version: 1.0 In-Reply-To: <87bl4rk7bh.fsf@osv.gnss.ru> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Content-Language: en-GB Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org On 17/09/2021 08:08, Sergey Organov wrote: > Junio C Hamano writes: > >> Sergey Organov writes: >> >>> I'm not sure I follow. What "show -p" has to do with "diff-index --cc"? >>> >>> My only point here is that usage of *--cc* in *diff-index* is entirely >>> undocumneted, and that needs to be somehow resolved. >> It was a response to your "historical status quo that is a problem." >> I do not think there is any problem with "diff-index --cc" (except >> for it wants a better documentation---but that we already agree) but > Ah, now I see, but it's exactly lack of documentation (and tests) that I > was referring to as the "problem of the historical status quo" on the > Git side, so I was somewhat confused by your original response. > > Also, it's still unclear, even if not very essential, what exactly that > "status quo" is when seen from the point of view of gitk. Does gitk > actually utilize *particular output* of "diff-index --cc" for better, or > gitk would be just as happy if it were synonym for "diff-index -p", or > even if it'd be just as happy if --cc were silently consumed by > diff-index? Did Johannes Sixt's earlier answer https://lore.kernel.org/git/cbd0d173-ef17-576b-ab7a-465d42c82265@kdbg.org/ help clarify the choices? >> I wanted to give you some credit for having worked on "--diff-merges", >> an effort to generalize things in a related area. > Thanks for that! More to follow ) > > Thanks, > -- Sergey Organov