From 5c91da25d7da304d98c8808968f474f9fb7ac4db Mon Sep 17 00:00:00 2001 From: Petr Baudis Date: Tue, 11 Apr 2006 13:22:17 +0200 Subject: Document --patch-with-raw Signed-off-by: Petr Baudis Signed-off-by: Junio C Hamano diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index ec6811c..338014c 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -4,6 +4,9 @@ -u:: Synonym for "-p". +--patch-with-raw:: + Generate patch but keep also the default raw diff output. + -z:: \0 line termination on output diff --git a/diff.h b/diff.h index 07b153b..c5372b9 100644 --- a/diff.h +++ b/diff.h @@ -113,6 +113,8 @@ extern void diffcore_std_no_resolve(struct diff_options *); " -z output diff-raw with lines terminated with NUL.\n" \ " -p output patch format.\n" \ " -u synonym for -p.\n" \ +" --patch-with-raw\n" \ +" output both a patch and the diff-raw format.\n" \ " --name-only show only names of changed files.\n" \ " --name-status show names and status of changed files.\n" \ " --full-index show full object name on index lines.\n" \ -- cgit v0.10.2-6-g49f6 From 90c1b08c7dc5be890e697237f67a188da235ffc8 Mon Sep 17 00:00:00 2001 From: Petr Baudis Date: Tue, 11 Apr 2006 13:30:46 +0200 Subject: Separate the raw diff and patch with a newline More friendly for human reading I believe, and possibly friendlier to some parsers (although only by an epsilon). Signed-off-by: Petr Baudis Signed-off-by: Junio C Hamano diff --git a/combine-diff.c b/combine-diff.c index 011bb8d..5f6048b 100644 --- a/combine-diff.c +++ b/combine-diff.c @@ -868,6 +868,7 @@ const char *diff_tree_combined_merge(const unsigned char *sha1, header = NULL; } opt->output_format = saved_format; + putchar(opt->line_termination); } for (p = paths; p; p = p->next) { if (show_combined_diff(p, num_parent, dense, diff --git a/diff.c b/diff.c index 99d76d0..a14e664 100644 --- a/diff.c +++ b/diff.c @@ -1322,6 +1322,7 @@ void diff_flush(struct diff_options *options) struct diff_filepair *p = q->queue[i]; flush_one_pair(p, DIFF_FORMAT_RAW, options); } + putchar(options->line_termination); } for (i = 0; i < q->nr; i++) { struct diff_filepair *p = q->queue[i]; -- cgit v0.10.2-6-g49f6