From: Sergey Organov Date: Mon, 30 Aug 2021 20:45:51 GMT Subject: Re: diff-index --cc no longer permitted, gitk is now broken (slightly) Message-ID: <87h7f6zmo0.fsf@osv.gnss.ru> In-Reply-To: <3ce08986-a402-0b07-de87-2d0f01aef7dc@kdbg.org> Johannes Sixt writes: > Am 30.08.21 um 15:05 schrieb Sergey Organov: >> As far as I can tell, --cc had no effect on diff-index, it was just >> silently consumed. If I'm right, this line in gitk never needed --cc. >> Then either gitk is to be fixed, or we can "fix" diff-index to silently >> consume --cc/-c again, for backward compatibility. > > That latter would be much preferable. Gitk uses the combination -p --cc > for *all* diff commands when it requests patch output regardless of the > number of parents. It would be tedious to special-case diff-index to not > pass --cc. It's already noticed by Jeff that --cc was not in fact a no-op, so diff-index is to be fixed. Sorry for the breakage. Thanks, -- Sergey Organov