From: Sergey Organov <sorganov@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: 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 21:41:26 +0300 [thread overview]
Message-ID: <878rzv59k9.fsf@osv.gnss.ru> (raw)
In-Reply-To: <xmqqbl4ri2mq.fsf@gitster.g> (Junio C. Hamano's message of "Fri, 17 Sep 2021 09:32:45 -0700")
Junio C Hamano <gitster@pobox.com> writes:
> Sergey Organov <sorganov@gmail.com> writes:
>
>> 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.
>
> Well, you said the fixup "restores" the status quo, but in fact,
> with or without the fixup, before or after it, the lack of
> documentation was there.
No, what problematic patch did, it changed behavior of diff-index
exactly in accordance with its *current* documentation that doesn't
mention --cc as accepted command-line option for diff-index. So, with
that patch applied, there were no this problem with documentation
anymore. Implementation now actually matched the docs.
Unfortunately, that brought worse problem: it unexpectedly broke gitk,
that, as it appeared, depends on undocumented diff-index behavior.
So, I re-enabled --cc in diff-index, lesser of two evils, that brought
back the problem of lack of documentation and test cases for "diff-index
--cc". This way, the status quo has been restored indeed.
> So I thought you were talking about something else.
>
>>> 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 )
>
> I somehow expect there was need for no further work in this area,
> but there are also many other areas in Git where your talent is
> applicable and appreciated, I am sure ;-)
I'm afraid we still didn't reach one of the ultimate goals of all this:
letting -m be useful again, specifically, as suitable *user* option.
Also, current --diff-merges options are incapable of providing current
-m behavior, as has been noticed by Jonathan Nieder in another thread on
reverting "-m implies -p" commit:
"When I try it locally, -m shows no diff by default,
whereas --diff-merges=separate shows a diff for merges."
and I'm going to fix this by adding yet another feature for
--diff-merges. This is to be pure addition, thus causing no backward
compatibility problems.
Thanks,
-- Sergey Organov
next prev parent reply other threads:[~2021-09-17 18:41 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 [this message]
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=878rzv59k9.fsf@osv.gnss.ru \
--to=sorganov@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j6t@kdbg.org \
--cc=paulus@ozlabs.org \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).