From: Sergey Organov <sorganov@gmail•com>
To: Philip Oakley <philipoakley@iee•email>
Cc: Junio C Hamano <gitster@pobox•com>, Johannes Sixt <j6t@kdbg•org>,
Jeff King <peff@peff•net>, Paul Mackerras <paulus@ozlabs•org>,
Git Mailing List <git@vger•kernel.org>
Subject: Re: diff-index --cc no longer permitted, gitk is now broken (slightly)
Date: Fri, 17 Sep 2021 20:34:12 +0300 [thread overview]
Message-ID: <87ee9n5cob.fsf@osv.gnss.ru> (raw)
In-Reply-To: <61ffe5ee-dcc9-4308-7ced-430c3891e898@iee.email> (Philip Oakley's message of "Fri, 17 Sep 2021 17:58:55 +0100")
Philip Oakley <philipoakley@iee•email> writes:
> On 17/09/2021 08:08, Sergey Organov wrote:
>> Junio C Hamano <gitster@pobox•com> writes:
>>
>>> Sergey Organov <sorganov@gmail•com> 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?
Sorry, no. I did read that carefully when it has been posted. Further
explanations by Johannes also only tell that gitk expects --cc to be
accepted by diff-index as it likes to treat multiple commands
universally, but don't specify what output git expects from --cc when it
passes it exactly to diff-index. Maybe it just shows the output and have
no other expectations, dunno.
"silent fall-back from --cc to -p in case of non-merge commits or
non-conflicted index is absolutely necessary" that is stated there is a
non-issue as it was always the case, and there are no questions about
it, as --cc in fact implies -p, and the latter is applied to non-merge
commits. So, how Git treats "non-conflicted index" and non-merge commits
does not depend on --cc. It's how it treats "conflicting index" that is
still unspecified.
Thanks,
-- Sergey Organov
next prev parent reply other threads:[~2021-09-17 17:34 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-30 8:03 diff-index --cc no longer permitted, gitk is now broken (slightly) Johannes Sixt
2021-08-30 13:05 ` Sergey Organov
2021-08-30 18:13 ` Jeff King
2021-08-30 20:01 ` Sergey Organov
2021-08-30 20:26 ` Johannes Sixt
2021-08-30 20:45 ` Sergey Organov
2021-08-30 17:12 ` Junio C Hamano
2021-08-30 17:40 ` Sergey Organov
2021-08-30 18:09 ` Junio C Hamano
2021-08-30 20:03 ` Sergey Organov
2021-09-01 16:52 ` Sergey Organov
2021-09-07 18:19 ` Junio C Hamano
2021-09-07 19:53 ` Sergey Organov
2021-09-08 13:43 ` Sergey Organov
2021-09-08 17:23 ` Johannes Sixt
2021-09-08 19:04 ` Sergey Organov
2021-09-09 17:07 ` Junio C Hamano
2021-09-09 20:07 ` Sergey Organov
2021-09-16 9:50 ` Sergey Organov
2021-09-16 21:15 ` Junio C Hamano
2021-09-16 22:41 ` Sergey Organov
2021-09-16 22:50 ` Junio C Hamano
2021-09-17 7:08 ` Sergey Organov
2021-09-17 16:32 ` Junio C Hamano
2021-09-17 18:41 ` Sergey Organov
2021-09-17 16:58 ` Philip Oakley
2021-09-17 17:34 ` Sergey Organov [this message]
2021-09-18 17:56 ` Sergey Organov
2021-09-07 20:32 ` Johannes Sixt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87ee9n5cob.fsf@osv.gnss.ru \
--to=sorganov@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
--cc=j6t@kdbg$(echo .)org \
--cc=paulus@ozlabs$(echo .)org \
--cc=peff@peff$(echo .)net \
--cc=philipoakley@iee$(echo .)email \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox