From: Marius Storm-Olsen <marius@trolltech•com>
To: Junio C Hamano <gitster@pobox•com>
Cc: "J. Bruce Fields" <bfields@citi•umich.edu>,
Johannes Schindelin <Johannes.Schindelin@gmx•de>,
Johannes Sixt <j.sixt@viscovery•net>, git <git@vger•kernel.org>
Subject: Re: [PATCH 0/2] Respecting core.autocrlf when showing objects
Date: Thu, 12 Jun 2008 22:16:24 +0200 [thread overview]
Message-ID: <48518418.2010007@trolltech.com> (raw)
In-Reply-To: <7vtzfy8n4i.fsf@gitster.siamese.dyndns.org>
Junio C Hamano wrote:
> Marius Storm-Olsen <marius@trolltech•com> writes:
>> Uhm, 'git checkout side file.txt' is not the same file content
>> (ignoring EOLs please) as 'git show :3:file.txt'. Ref:
>> user-manual.html#conflict-resolution
>
> Bruce, I think the comment in this quoted section is wrong.
>
> True, the combined diff can show only the interesting differences
> between the three, but that is not because we munge stage #2 and #3.
> They contain verbatim copies from the HEAD and the MERGE_HEAD
> respectively, and the combining logic runs three-way diffs between
> the three stages to discard the hunks that the result comes solely
> from either stage #2 or stage #3.
...
> -Since the stage 2 and stage 3 versions have already been updated
> with -nonconflicting changes, the only remaining differences between
> them are -the important ones; thus linkgit:git-diff[1] can use the
> information in -the index to show only those conflicts. +When you ask
> linkgit:git-diff[1] to show the conflicts, it runs a +three-way diff
> between the conflicted merge results in the work tree with +stages 2
> and 3 to show only hunks whose contents come from both sides, +mixed
> (in other words, when a hunk's merge results come only from stage 2,
> +that part is not conflicting and is not shown. Same for stage 3).
Aah, that certainly clears things up a bit. A good patch I'd say.
However, it doesn't change the fact that IMO "git show" should respect
core.autocrlf, while "git cat-file" shouldn't.
I think many would consider
git show MERGE_HEAD:file.txt > file.txt
before
git checkout MERGE_HEAD file.txt
if only because they'd be scared to do a "checkout" in the middle of a
merge conflict.
Personally I think the latter is nice, short and sweet, but that doesn't
mean that it's less scary for people staring out on git. The fact that
the two commands above are *not* identical in result, are the kind of
things that we need to iron out, to make git more accessible to the
general public.
--
.marius
prev parent reply other threads:[~2008-06-12 20:17 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 11:40 ` 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
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 [this message]
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=48518418.2010007@trolltech.com \
--to=marius@trolltech$(echo .)com \
--cc=Johannes.Schindelin@gmx$(echo .)de \
--cc=bfields@citi$(echo .)umich.edu \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
--cc=j.sixt@viscovery$(echo .)net \
/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