From 5f78d89d591ad26b902947288625b90528954372 Mon Sep 17 00:00:00 2001 From: Hiltjo Posthuma Date: Tue, 16 Nov 2021 14:24:30 +0100 Subject: [PATCH] ignore '\r' in writing the blob aswell Follow-up on commit 295e4b8cb95114bb74b582c7332bc4c171f36dd3 which changed it for diffs. --- stagit.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/stagit.c b/stagit.c index 07d7929..b9c0d37 100644 --- a/stagit.c +++ b/stagit.c @@ -562,14 +562,15 @@ writeblobhtml(FILE *fp, const git_blob *blob) continue; n++; fprintf(fp, nfmt, n, n, n); - xmlencode(fp, &s[prev], i - prev + 1); + xmlencodeline(fp, &s[prev], i - prev + 1); + putc('\n', fp); prev = i + 1; } /* trailing data */ if ((len - prev) > 0) { n++; fprintf(fp, nfmt, n, n, n); - xmlencode(fp, &s[prev], len - prev); + xmlencodeline(fp, &s[prev], len - prev); } }