From: Junio C Hamano <gitster@pobox•com>
To: Johannes Schindelin <Johannes.Schindelin@gmx•de>
Cc: Johannes Sixt <j.sixt@viscovery•net>,
Marius Storm-Olsen <marius@trolltech•com>,
git <git@vger•kernel.org>
Subject: Re: [PATCH 2/2] merge-recursive: respect core.autocrlf
Date: Mon, 09 Jun 2008 14:36:29 -0700 [thread overview]
Message-ID: <7vod6affz6.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <alpine.DEB.1.00.0806092223010.1783@racer> (Johannes Schindelin's message of "Mon, 9 Jun 2008 22:23:16 +0100 (BST)")
Johannes Schindelin <Johannes.Schindelin@gmx•de> writes:
> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx•de>
> ---
> builtin-merge-recursive.c | 8 ++++++++
> t/t6033-merge-crlf.sh | 2 +-
> 2 files changed, 9 insertions(+), 1 deletions(-)
>
> diff --git a/builtin-merge-recursive.c b/builtin-merge-recursive.c
> index 7643f17..edd023f 100644
> --- a/builtin-merge-recursive.c
> +++ b/builtin-merge-recursive.c
> @@ -525,6 +525,7 @@ static void update_file_flags(const unsigned char *sha,
> enum object_type type;
> void *buf;
> unsigned long size;
> + struct strbuf strbuf;
>
> if (S_ISGITLINK(mode))
> die("cannot read object %s '%s': It is a submodule!",
> @@ -535,6 +536,12 @@ static void update_file_flags(const unsigned char *sha,
> die("cannot read object %s '%s'", sha1_to_hex(sha), path);
> if (type != OBJ_BLOB)
> die("blob expected for %s '%s'", sha1_to_hex(sha), path);
> + strbuf_init(&strbuf, 0);
> + if (convert_to_working_tree(path, buf, size, &strbuf)) {
> + free(buf);
> + size = strbuf.len;
> + buf = strbuf_detach(&strbuf, NULL);
> + }
>
> if (make_room_for_path(path) < 0) {
> update_wd = 0;
Fairly straightforward fix, except that I suspect this needs to be done
only for regular files and not symlinks.
I think entry.c:write_entry() shows how this should be done.
next prev parent reply other threads:[~2008-06-09 21:37 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <"Storm-Olsen*"@MHS>
2008-06-09 11:40 ` [PATCH] Add testcase for merging in a CRLF repo, showing that conflict file is in LF only Marius Storm-Olsen
2008-06-09 13:37 ` Johannes Sixt
2008-06-09 14:46 ` Marius Storm-Olsen
2008-06-09 15:05 ` Johannes Sixt
2008-06-09 19:44 ` Marius Storm-Olsen
2008-06-09 21:22 ` [PATCH 1/2] Add testcase for merging in a CRLF repo Johannes Schindelin
2008-06-09 21:23 ` [PATCH 2/2] merge-recursive: respect core.autocrlf Johannes Schindelin
2008-06-09 21:36 ` Junio C Hamano [this message]
2008-06-09 22:59 ` [PATCH v2] " Johannes Schindelin
2008-06-09 23:23 ` Junio C Hamano
2008-06-09 23:35 ` Johannes Schindelin
2008-06-10 8:10 ` [PATCH 0/2] Respecting core.autocrlf when showing objects Marius Storm-Olsen
2008-06-10 7:40 ` [PATCH 1/2] Add testcases for verifying that staged files in a conflict are CRLF, when core.autocrlf = true Marius Storm-Olsen
2008-06-10 7:55 ` [PATCH 2/2] Ensure that objects shown in a core.autocrlf = true repo have CRLF EOLs Marius Storm-Olsen
2008-06-10 15:34 ` [PATCH 0/2] Respecting core.autocrlf when showing objects Johannes Schindelin
2008-06-10 22:25 ` Junio C Hamano
2008-06-11 6:01 ` Marius Storm-Olsen
2008-06-11 8:25 ` Jakub Narebski
2008-06-11 19:06 ` Johannes Schindelin
2008-06-12 9:03 ` Marius Storm-Olsen
2008-06-12 19:33 ` Junio C Hamano
2008-06-12 19:55 ` J. Bruce Fields
2008-06-12 20:27 ` Jakub Narebski
2008-06-12 20:45 ` Junio C Hamano
2008-06-12 20:50 ` Jon Loeliger
2008-06-12 20:16 ` Marius Storm-Olsen
2008-06-09 11:40 ` [PATCH] Add testcase for merging in a CRLF repo, showing that conflict file is in LF only Marius Storm-Olsen
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vod6affz6.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox$(echo .)com \
--cc=Johannes.Schindelin@gmx$(echo .)de \
--cc=git@vger$(echo .)kernel.org \
--cc=j.sixt@viscovery$(echo .)net \
--cc=marius@trolltech$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox