From: Jeff King <peff@peff.net>
To: Sergey Organov <sorganov@gmail.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 14:13:51 -0400 [thread overview]
Message-ID: <YS0f37xPKOHCDHr1@coredump.intra.peff.net> (raw)
In-Reply-To: <875yvn9j69.fsf@osv.gnss.ru>
On Mon, Aug 30, 2021 at 04:05:50PM +0300, Sergey Organov wrote:
> > 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.
I think it does have an effect. Try this to generate a simple merge
conflict:
git init repo
cd repo
echo base >file
git add file
git commit -m base
echo main >file
git commit -am main
git checkout -b side HEAD^
echo side >file
git commit -am side
git merge main ;# maybe master here depending on your config
And then with pre-v2.33 Git, --cc does a combined diff:
$ git.v2.32.0 diff-index -p HEAD
diff --git a/file b/file
index 2299c37..81768df 100644
--- a/file
+++ b/file
@@ -1 +1,5 @@
+<<<<<<< HEAD
side
+=======
+main
+>>>>>>> main
$ git.v2.32.0 diff-index --cc HEAD
diff --cc file
index df967b9,2299c37..0000000
--- a/file
+++ b/file
@@@ -1,1 -1,1 +1,5 @@@
- base
++<<<<<<< HEAD
+ side
++=======
++main
++>>>>>>> main
Likewise, --raw will show a combined diff, though it's a bit less useful
because the unmerged entry has a null sha1:
$ git.v2.32.0 diff-index HEAD
:100644 100644 2299c37978265a95cbe835a4b0f0bbf15aad5549 0000000000000000000000000000000000000000 M file
$ git.v2.32.0 diff-index --cc --raw HEAD
::100644 100644 100644 df967b96a579e45a18b8251732d16804b2e56a55 2299c37978265a95cbe835a4b0f0bbf15aad5549 0000000000000000000000000000000000000000 MM file
-Peff
next prev parent reply other threads:[~2021-08-30 18:13 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 [this message]
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
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=YS0f37xPKOHCDHr1@coredump.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=j6t@kdbg.org \
--cc=paulus@ozlabs.org \
--cc=sorganov@gmail.com \
/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.
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 NNTP newsgroup(s).