public inbox for git@vger.kernel.org 
 help / color / mirror / Atom feed

From: Sergey Organov <sorganov@gmail•com>
To: Junio C Hamano <gitster@pobox•com>
Cc: Johannes Sixt <j6t@kdbg•org>,
	Git Mailing List <git@vger•kernel.org>,
	Paul Mackerras <paulus@ozlabs•org>
Subject: Re: diff-index --cc no longer permitted, gitk is now broken (slightly)
Date: Mon, 30 Aug 2021 20:40:27 +0300	[thread overview]
Message-ID: <87o89e3k6s.fsf@osv.gnss.ru> (raw)
In-Reply-To: <xmqqsfyq501v.fsf@gitster.g> (Junio C. Hamano's message of "Mon, 30 Aug 2021 10:12:28 -0700")

Junio C Hamano <gitster@pobox•com> writes:

> Johannes Sixt <j6t@kdbg•org> writes:
>
>> Since 19b2517f95a0 (diff-merges: move specific diff-index "-m" handling
>> to diff-index, 2021-05-21) git diff-index no longer accepts --cc. This
>> breaks gitk: it invokes
>>
>>    git diff-index --cached -p -C --cc --no-commit-id -U3 HEAD
>>
>> to show the staged changes (when the line "Local changes checked in to
>> index but not committed" is selected).
>>
>> The man page of git diff-index does not mention --cc as an option. I
>> haven't fully grokked the meaning of --cc, so I cannot tell whether this
>> absence has any significance (is deliberate or an omission).
>>
>> Is gitk wrong to add --cc unconditionally? Should it do so only when
>> there are conflicts? Or not at all?
>
> I think --cc is designed to naturally fall back to -p when there is
> only one parent.  Use of both -p and --cc has also long been an
> acceptable combination, and even if we say the later --cc overrides
> -p, there is no reason not to show single parent patch here with
> --cc.

I'm pretty sure I've checked diff-index doesn't use the flag that --cc
sets when I wrote the patch, so the only incompatibility this patch
introduced is denying the command when --cc is given, i.e., it now
behaves as if diff-index doesn't support --cc *option*, that makes sense
to me and matches diff-index documentation.

Irrespective to chosen solution, it still looks to me like gitk
shouldn't had --cc in that command in the first place. I that correct,
or do I miss something essential?

That said, if you think that diff-index should silently accept --cc (and
-c ?), for whatever reason, it's fine with me, provided it's properly
documented and there are proper test-cases in place.

Thanks,
-- Sergey Organov

next prev parent reply	other threads:[~2021-08-30 17:40 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 [this message]
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
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=87o89e3k6s.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 \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox