From: Johannes Sixt <j.sixt@viscovery.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: [PATCH] diff/diff-files: do not use --cc too aggressively
Date: Thu, 18 Sep 2008 11:30:26 +0200 [thread overview]
Message-ID: <48D21FB2.50700@viscovery.net> (raw)
In-Reply-To: <7v7i99zuqh.fsf_-_@gitster.siamese.dyndns.org>
Junio C Hamano schrieb:
> Textual diff output for unmerged paths was too eager to give condensed
> combined diff. This has two problems:
>
> (1) "diff --base/--ours/--theirs" (and "diff-files -p" with the same) is
> a request to compare with the named stage. We showed "-c -p" output
> instead;
I cannot reproduce what you describe here. "diff --base/--ours/--theirs"
works as expected with and without this patch.
> (2) "diff -c" (and "diff-files -c -p") is a request to view combined diff
> without condensing (otherwise the user would have explicitly asked
> for --cc, not -c). We showed "--cc" output anyway.
The patch fixes this:
Tested-by: Johannes Sixt <johannes.sixt@telecom.at>
-- Hannes
prev parent reply other threads:[~2008-09-18 9:31 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-09-17 8:00 combined diff, but not condensed, howto? Johannes Sixt
2008-09-17 16:58 ` Junio C Hamano
2008-09-18 5:57 ` Johannes Sixt
2008-09-18 6:14 ` Junio C Hamano
2008-09-18 6:24 ` Johannes Sixt
2008-09-18 7:01 ` Junio C Hamano
2008-09-18 7:30 ` Johannes Sixt
2008-09-18 9:08 ` [PATCH] diff/diff-files: do not use --cc too aggressively Junio C Hamano
2008-09-18 9:30 ` Johannes Sixt [this message]
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=48D21FB2.50700@viscovery.net \
--to=j.sixt@viscovery.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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).