Johannes Sixt <j6t@xxxxxxxx> writes: > Since 19b2517f95a0 (diff-merges: move specific diff-index "-m" handling > to diff-index, 2021-05-21) git diff-index no longer accepts --cc. Yep, this is expected, and I even put corresponding comment in the source: /* * We need no diff for merges options, and we need to avoid conflict * with our own meaning of "-m". */ > 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? 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. If --cc did affect diff-index, then my commit in question is wrong and should be fixed. Thanks, -- Sergey Organov
