Git development
 help / color / mirror / Atom feed
From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Marius Storm-Olsen <marius@trolltech.com>
Cc: Junio C Hamano <gitster@pobox.com>,
	Johannes Sixt <j.sixt@viscovery.net>, git <git@vger.kernel.org>
Subject: Re: [PATCH 0/2] Respecting core.autocrlf when showing objects
Date: Wed, 11 Jun 2008 20:06:08 +0100 (BST)	[thread overview]
Message-ID: <alpine.DEB.1.00.0806112000400.1783@racer> (raw)
In-Reply-To: <484F6A27.1040602@trolltech.com>

Hi,

On Wed, 11 Jun 2008, Marius Storm-Olsen wrote:

> Well, consider this:
>
> Say you are merging two branches, and know that you want to just use the 
> parts which conflict from the branch being merged in. Then you simply 
> do:
>
> 	git merge side
> 	git show :3:file.txt > file.txt

This is not really how I would do things.  I would do

	git checkout side file.txt here.

The _point_ is: "git show" is supposed to show you the contents _in the 
repository_.  For example, no smudge/clean filters will be heeded, and 
neither other attributes.

Further, "git show" will work without any problems in any bare repository.

In other words: "git show" is _not_ an operation on a working directory.

"git checkout" is.  So use that instead.

> Given that 'git show' *is* porcelain, I'd expect it to work 'naturally' 
> in my workflow, and not dump raw object store content.

Do not confuse porcelain with "works on the working directory".

> The fact that the stage files are in the index doesn't matter. I'd want 
> CRLF files from 'git show v1.5.6-rc0:builtin-log.c' as well.

But it _does_ matter!

The index works on raw objects, not on smudged files.  Period.

Ciao,
Dscho

  parent reply	other threads:[~2008-06-11 19:08 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 [this message]
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

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=alpine.DEB.1.00.0806112000400.1783@racer \
    --to=johannes.schindelin@gmx.de \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=j.sixt@viscovery.net \
    --cc=marius@trolltech.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.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox