diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-04-11 02:44:35 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-04-11 02:44:35 (GMT) |
| commit | 6b32ee2381deb414378a76cae213a4fe633f8fcc (patch) | |
| tree | 040786e8c512ea7bafa08a4fced71390a123aad7 /combine-diff.c | |
| parent | 910a5916b40575501b452a61e6447f96e77ec95e (diff) | |
| parent | 86ff1d2012cc5e074d54c0823154019b99ca03f0 (diff) | |
| download | git-6b32ee2381deb414378a76cae213a4fe633f8fcc.zip git-6b32ee2381deb414378a76cae213a4fe633f8fcc.tar.gz git-6b32ee2381deb414378a76cae213a4fe633f8fcc.tar.bz2 | |
Merge branch 'jc/withraw' into next
* jc/withraw:
diff-* --patch-with-raw
Retire git-log.sh (take#2)
Retire git-log.sh
Retire diffcore-pathspec.
Improve the git-diff-tree -c/-cc documentation
Diffstat (limited to 'combine-diff.c')
| -rw-r--r-- | combine-diff.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/combine-diff.c b/combine-diff.c index eb0d757..011bb8d 100644 --- a/combine-diff.c +++ b/combine-diff.c @@ -832,6 +832,7 @@ const char *diff_tree_combined_merge(const unsigned char *sha1, diffopts = *opt; diffopts.output_format = DIFF_FORMAT_NO_OUTPUT; + diffopts.with_raw = 0; diffopts.recursive = 1; /* count parents */ @@ -858,6 +859,16 @@ const char *diff_tree_combined_merge(const unsigned char *sha1, num_paths++; } if (num_paths) { + if (opt->with_raw) { + int saved_format = opt->output_format; + opt->output_format = DIFF_FORMAT_RAW; + for (p = paths; p; p = p->next) { + if (show_combined_diff(p, num_parent, dense, + header, opt)) + header = NULL; + } + opt->output_format = saved_format; + } for (p = paths; p; p = p->next) { if (show_combined_diff(p, num_parent, dense, header, opt)) |