From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>
Cc: Whit Armstrong <armstrong.whit@gmail.com>, git@vger.kernel.org
Subject: Re: [PATCH 08/16] t4200: use cut instead of sed
Date: Thu, 13 Mar 2008 11:00:23 -0700 [thread overview]
Message-ID: <7vtzjay05k.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <20080313125920.GF19485@coredump.intra.peff.net> (Jeff King's message of "Thu, 13 Mar 2008 08:59:20 -0400")
Jeff King <peff@peff.net> writes:
> But the actual problem is that MERGE_RR lacks a trailing newline. I
> don't see any code to add newlines, even though it seems possible that
> we will write out several paths. So I think we need a newline here:
>
> diff --git a/builtin-rerere.c b/builtin-rerere.c
> index c607aad..e4a1dc1 100644
> --- a/builtin-rerere.c
> +++ b/builtin-rerere.c
> @@ -58,7 +58,8 @@ static int write_rr(struct path_list *rr, int out_fd)
> int length = strlen(path) + 1;
> if (write_in_full(out_fd, rr->items[i].util, 40) != 40 ||
> write_in_full(out_fd, "\t", 1) != 1 ||
> - write_in_full(out_fd, path, length) != length)
> + write_in_full(out_fd, path, length) != length ||
> + write_in_full(out_fd, "\n", 1) != 1)
> die("unable to write rerere record");
> }
> if (commit_lock_file(&write_lock) != 0)
No, check 3f43d72392b6c0477debd7edbd49bae9b7f41e60^:git-rerere.perl; the
records in this file are supposed to be NUL terminated (the paths are
allowed to have LF in them).
> And unless I am missing something, rerere on multiple paths is very
> broken (but that seems weird, since this code is so old).
I do not recall offhand an example of multi-path rerere working or not
working correctly, but I am not surprised if the C re-implementation is
broken. Will need to check.
next prev parent reply other threads:[~2008-03-13 18:01 UTC|newest]
Thread overview: 59+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <cover.1205356737.git.peff@peff.net>
2008-03-12 21:29 ` [PATCH 01/16] tr portability fixes Jeff King
2008-03-13 7:32 ` Johannes Sixt
2008-03-13 13:06 ` Jeff King
2008-03-12 21:30 ` [PATCH 02/16] t0050: perl portability fix Jeff King
2008-03-13 7:38 ` Johannes Sixt
2008-03-12 21:31 ` [PATCH 03/16] more tr portability test script fixes Jeff King
2008-03-13 8:28 ` Frank Lichtenheld
2008-03-13 13:09 ` Jeff King
2008-03-18 22:23 ` Alex Riesen
2008-03-18 22:24 ` [PATCH] Add test-tr: poor-man tr for the test suite Alex Riesen
2008-03-18 22:24 ` [PATCH] Use test-tr in " Alex Riesen
2008-03-18 22:44 ` [PATCH 03/16] more tr portability test script fixes Jeff King
2008-03-18 23:24 ` Alex Riesen
2008-03-19 21:40 ` Junio C Hamano
2008-03-19 22:56 ` Alex Riesen
2008-03-12 21:32 ` [PATCH 04/16] grep portability fix: don't use "-e" or "-q" Jeff King
2008-03-12 22:10 ` Junio C Hamano
2008-03-12 22:45 ` Junio C Hamano
2008-03-12 21:34 ` [PATCH 05/16] remove use of "tail -n 1" and "tail -1" Jeff King
2008-03-12 21:36 ` [PATCH 06/16] add test_cmp function for test scripts Jeff King
2008-03-12 22:12 ` Junio C Hamano
2008-03-13 12:08 ` Jeff King
2008-03-13 20:48 ` Junio C Hamano
2008-03-12 21:37 ` [PATCH 07/16] t4020: don't use grep -a Jeff King
2008-03-12 21:37 ` [PATCH 08/16] t4200: use cut instead of sed Jeff King
2008-03-13 4:52 ` Junio C Hamano
2008-03-13 12:59 ` Jeff King
2008-03-13 18:00 ` Junio C Hamano [this message]
2008-03-14 21:40 ` Jeff King
2008-03-12 21:38 ` [PATCH 09/16] t6000lib: tr portability fix Jeff King
2008-03-14 20:47 ` [PATCH] t/t6000lib.sh: tr portability fix fix Brandon Casey
2008-03-14 20:54 ` Jeff King
2008-03-14 21:00 ` Brandon Casey
2008-03-14 21:26 ` Brandon Casey
2008-03-14 21:45 ` Jeff King
2008-03-14 22:06 ` Brandon Casey
2008-03-12 21:39 ` [PATCH 10/16] add NO_EXTERNAL_GREP build option Jeff King
2008-03-12 22:30 ` Junio C Hamano
2008-03-13 12:10 ` Jeff King
2008-03-13 7:50 ` Johannes Sixt
2008-03-13 12:41 ` Jeff King
2008-03-13 13:59 ` Johannes Sixt
2008-03-13 14:04 ` Jeff King
2008-03-13 14:09 ` Johannes Sixt
2008-03-13 7:56 ` Junio C Hamano
2008-03-12 21:40 ` [PATCH 11/16] config: add --literal-match option Jeff King
2008-03-12 21:46 ` Jakub Narebski
2008-03-13 13:24 ` Jeff King
2008-03-12 22:34 ` Junio C Hamano
2008-03-13 12:42 ` Jeff King
2008-03-12 21:40 ` [PATCH 12/16] git-submodule: avoid sed input with no newline Jeff King
2008-03-12 22:41 ` Junio C Hamano
2008-03-13 12:46 ` Jeff King
2008-03-12 21:41 ` [PATCH 13/16] filter-branch: don't use xargs -0 Jeff King
2008-03-12 21:41 ` [PATCH 14/16] filter-branch: use $SHELL_PATH instead of 'sh' Jeff King
2008-03-12 21:42 ` [PATCH 15/16] t9112: add missing #!/bin/sh header Jeff King
2008-03-12 21:42 ` [PATCH 16/16] t7505: use SHELL_PATH in hook Jeff King
2008-03-13 7:11 ` Adam Piatyszek
2008-03-13 13:00 ` Jeff King
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=7vtzjay05k.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=armstrong.whit@gmail.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
/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).