# [PATCH 2/2] combine-diff: Honour -z option correctly. 3 messages from 2006-02-27 to 2006-02-27. Participants: Mark Wooding. Thread: https://gitlist.dev/t/3474 ## Mark Wooding, 2006-02-27 12:48 Subject: [PATCH 0/2] combine-diff consistency fixes Message-ID: <20060227124815.25144.83101.stgit@metalzone.distorted.org.uk> URL: https://gitlist.dev/e/20060227124815.25144.83101.stgit%40metalzone.distorted.org.uk ``` The output of git diff-tree --cc on a merge is not consistent with its output for a normal commit. In particular: * the index lines on a combined diff are abbreviated even if --full-index is given, and * the headers on a combined diff are not null terminated, even if -z is given. For example, run git-diff-tree --cc -z --full-index f0b0af1b04f558b684cae2a3b805ca4bab84d45f -- [mdw] ``` ## Mark Wooding, 2006-02-27 12:52 Subject: [PATCH 1/2] combine-diff: Honour --full-index. Message-ID: <20060227125250.25144.28246.stgit@metalzone.distorted.org.uk> URL: https://gitlist.dev/e/20060227125250.25144.28246.stgit%40metalzone.distorted.org.uk In-Reply-To: <20060227124815.25144.83101.stgit@metalzone.distorted.org.uk> ``` From: Mark Wooding For some reason, combined diffs don't honour the --full-index flag when emitting patches. Fix this. Signed-off-by: Mark Wooding --- combine-diff.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/combine-diff.c b/combine-diff.c index d812600..984103e 100644 --- a/combine-diff.c +++ b/combine-diff.c @@ -621,7 +621,8 @@ static void reuse_combine_diff(struct sl } static int show_patch_diff(struct combine_diff_path *elem, int num_parent, - int dense, const char *header) + int dense, const char *header, + struct diff_options *opt) { unsigned long size, cnt, lno; char *result, *cp, *ep; @@ -631,6 +632,7 @@ static int show_patch_diff(struct combin char ourtmp_buf[TMPPATHLEN]; char *ourtmp = ourtmp_buf; int working_tree_file = !memcmp(elem->sha1, null_sha1, 20); + int abbrev = opt->full_index ? 40 : DEFAULT_ABBREV; /* Read the result of merge first */ if (!working_tree_file) { @@ -735,10 +737,10 @@ static int show_patch_diff(struct combin printf("index "); for (i = 0; i < num_parent; i++) { abb = find_unique_abbrev(elem->parent[i].sha1, - DEFAULT_ABBREV); + abbrev); printf("%s%s", i ? "," : "", abb); } - abb = find_unique_abbrev(elem->sha1, DEFAULT_ABBREV); + abb = find_unique_abbrev(elem->sha1, abbrev); printf("..%s\n", abb); if (mode_differs) { @@ -862,7 +864,7 @@ int show_combined_diff(struct combine_di default: case DIFF_FORMAT_PATCH: - return show_patch_diff(p, num_parent, dense, header); + return show_patch_diff(p, num_parent, dense, header, opt); } } ``` ## Mark Wooding, 2006-02-27 12:52 Subject: [PATCH 2/2] combine-diff: Honour -z option correctly. Message-ID: <20060227125252.25144.12278.stgit@metalzone.distorted.org.uk> URL: https://gitlist.dev/e/20060227125252.25144.12278.stgit%40metalzone.distorted.org.uk In-Reply-To: <20060227124815.25144.83101.stgit@metalzone.distorted.org.uk> ``` From: Mark Wooding Combined diffs don't null terminate things in the same way as standard diffs. This is presumably wrong. Signed-off-by: Mark Wooding --- combine-diff.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/combine-diff.c b/combine-diff.c index 984103e..a23894d 100644 --- a/combine-diff.c +++ b/combine-diff.c @@ -726,7 +726,7 @@ static int show_patch_diff(struct combin if (header) { shown_header++; - puts(header); + printf("%s%c", header, opt->line_termination); } printf("diff --%s ", dense ? "cc" : "combined"); if (quote_c_style(elem->path, NULL, NULL, 0)) @@ -799,7 +799,7 @@ static void show_raw_diff(struct combine inter_name_termination = 0; if (header) - puts(header); + printf("%s%c", header, line_termination); for (i = 0; i < num_parent; i++) { if (p->parent[i].mode) ```