From: "René Scharfe" <l.s.r@web.de>
To: Git List <git@vger.kernel.org>
Cc: Junio C Hamano <gitster@pobox.com>
Subject: [PATCH 1/9] test-mergesort: use strbuf_getline()
Date: Fri, 1 Oct 2021 11:10:09 +0200 [thread overview]
Message-ID: <928cb42c-c45b-c90a-c71b-2f6669e03251@web.de> (raw)
In-Reply-To: <943b1e01-465e-5def-a766-0adf667690de@web.de>
Strip line ending characters to make sure empty lines are sorted like
sort(1) does.
Signed-off-by: René Scharfe <l.s.r@web.de>
---
t/helper/test-mergesort.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/t/helper/test-mergesort.c b/t/helper/test-mergesort.c
index c5cffaa4b7..621e2a5197 100644
--- a/t/helper/test-mergesort.c
+++ b/t/helper/test-mergesort.c
@@ -28,9 +28,7 @@ int cmd__mergesort(int argc, const char **argv)
struct line *line, *p = NULL, *lines = NULL;
struct strbuf sb = STRBUF_INIT;
- for (;;) {
- if (strbuf_getwholeline(&sb, stdin, '\n'))
- break;
+ while (!strbuf_getline(&sb, stdin)) {
line = xmalloc(sizeof(struct line));
line->text = strbuf_detach(&sb, NULL);
if (p) {
@@ -46,7 +44,7 @@ int cmd__mergesort(int argc, const char **argv)
lines = llist_mergesort(lines, get_next, set_next, compare_strings);
while (lines) {
- printf("%s", lines->text);
+ puts(lines->text);
lines = lines->next;
}
return 0;
--
2.33.0
next prev parent reply other threads:[~2021-10-01 9:10 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-01 9:07 [PATCH 0/9] mergesort: improve tests and performance René Scharfe
2021-10-01 9:10 ` René Scharfe [this message]
2021-10-02 9:08 ` [PATCH 1/9] test-mergesort: use strbuf_getline() Ævar Arnfjörð Bjarmason
2021-10-02 16:56 ` René Scharfe
2021-10-01 9:11 ` [PATCH 2/9] test-mergesort: add sort subcommand René Scharfe
2021-10-01 20:26 ` Junio C Hamano
2021-10-01 9:12 ` [PATCH 3/9] test-mergesort: add test subcommand René Scharfe
2021-10-01 20:26 ` Junio C Hamano
2021-10-02 8:35 ` Ævar Arnfjörð Bjarmason
2021-10-03 10:15 ` René Scharfe
2021-10-03 17:33 ` Junio C Hamano
2021-10-07 20:00 ` René Scharfe
2021-10-08 4:04 ` [PATCH 10/9 v2] test-mergesort: use repeatable random numbers René Scharfe
2021-10-08 4:17 ` Jeff King
2021-10-08 7:23 ` Ævar Arnfjörð Bjarmason
2021-10-08 17:30 ` René Scharfe
2021-10-08 19:00 ` Ævar Arnfjörð Bjarmason
2021-10-03 10:15 ` [PATCH 3/9] test-mergesort: add test subcommand René Scharfe
2021-10-01 9:14 ` [PATCH 4/9] test-mergesort: add generate subcommand René Scharfe
2021-10-01 9:16 ` [PATCH 5/9] test-mergesort: add unriffle mode René Scharfe
2021-10-01 9:17 ` [PATCH 6/9] test-mergesort: add unriffle_skewed mode René Scharfe
2021-10-01 9:19 ` [PATCH 7/9] p0071: measure sorting of already sorted and reversed files René Scharfe
2021-10-01 9:19 ` [PATCH 8/9] p0071: test performance of llist_mergesort() René Scharfe
2021-10-01 9:22 ` [PATCH 9/9] mergesort: use ranks stack René Scharfe
2022-01-17 17:43 ` Ævar Arnfjörð Bjarmason
2022-01-17 18:22 ` René Scharfe
2022-01-18 5:07 ` René Scharfe
2022-01-18 10:40 ` Ævar Arnfjörð Bjarmason
2022-01-18 12:27 ` René Scharfe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=928cb42c-c45b-c90a-c71b-2f6669e03251@web.de \
--to=l.s.r@web.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).