From: Linus Torvalds <torvalds@osdl.org>
To: Junio C Hamano <junkio@cox.net>, Git Mailing List <git@vger.kernel.org>
Subject: Re: "git diff a..b" broken
Date: Tue, 7 Feb 2006 10:26:41 -0800 (PST) [thread overview]
Message-ID: <Pine.LNX.4.64.0602071024270.3854@g5.osdl.org> (raw)
In-Reply-To: <Pine.LNX.4.64.0602071020120.3854@g5.osdl.org>
On Tue, 7 Feb 2006, Linus Torvalds wrote:
>
> Just a heads up. I'll try to track down what the breakage is.
Ahh. Very simple.
The "--cc" implies "-p", but without the recursive part.
Linus
----
diff --git a/diff-tree.c b/diff-tree.c
index f3280a1..7148323 100644
--- a/diff-tree.c
+++ b/diff-tree.c
@@ -284,14 +284,15 @@ int main(int argc, const char **argv)
}
usage(diff_tree_usage);
}
- if (diff_options.output_format == DIFF_FORMAT_PATCH)
- diff_options.recursive = 1;
if (combine_merges) {
diff_options.output_format = DIFF_FORMAT_PATCH;
ignore_merges = 0;
}
+ if (diff_options.output_format == DIFF_FORMAT_PATCH)
+ diff_options.recursive = 1;
+
diff_tree_setup_paths(get_pathspec(prefix, argv));
diff_setup_done(&diff_options);
next prev parent reply other threads:[~2006-02-07 18:27 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-02-07 18:23 "git diff a..b" broken Linus Torvalds
2006-02-07 18:26 ` Linus Torvalds [this message]
2006-02-07 20:42 ` Junio C Hamano
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=Pine.LNX.4.64.0602071024270.3854@g5.osdl.org \
--to=torvalds@osdl.org \
--cc=git@vger.kernel.org \
--cc=junkio@cox.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).