Hi, On Thu, 13 Apr 2006, Johannes Schindelin wrote: > I just realized that something is wrong with this patch: the first file > of the patchset seems to be ignored. I'll fix it tomorrow. Okay, so I lied: I fixed it today. diff --git a/diff-tree.c b/diff-tree.c index 2b79dd0..536da8e 100644 --- a/diff-tree.c +++ b/diff-tree.c @@ -117,7 +117,8 @@ int main(int argc, const char **argv) if (opt->dense_combined_merges) opt->diffopt.output_format = DIFF_FORMAT_PATCH; - if (opt->diffopt.output_format == DIFF_FORMAT_PATCH) + if (opt->diffopt.output_format == DIFF_FORMAT_DIFFSTAT || + opt->diffopt.output_format == DIFF_FORMAT_PATCH) opt->diffopt.recursive = 1; diff_tree_setup_paths(get_pathspec(prefix, argv), opt); diff --git a/git.c b/git.c index 5cb0d32..e4fcf92 100644 --- a/git.c +++ b/git.c @@ -344,7 +344,8 @@ static int cmd_log(int argc, const char opt.ignore_merges = 0; if (opt.dense_combined_merges) opt.diffopt.output_format = DIFF_FORMAT_PATCH; - if (opt.diffopt.output_format == DIFF_FORMAT_PATCH) + if (opt.diffopt.output_format == DIFF_FORMAT_DIFFSTAT || + opt.diffopt.output_format == DIFF_FORMAT_PATCH) opt.diffopt.recursive = 1; if (!full_diff && rev.prune_data) diff_tree_setup_paths(rev.prune_data, &opt.diffopt); - : send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html