Re: need help with git show :1:...

From: Elijah Newren <newren@gmail.com>
Date: Apr 8, 2009, 17:58 UTC
Message-ID: <51419b2c0904081058p7d5a56c3j6aa5cebb0188ad43@mail.gmail.com>
In-Reply-To: <6838.1239212486@relay.known.net>

On Wed, Apr 8, 2009 at 11:41 AM, layer <layer@known.net> wrote:

Show 18 quoted lines

> I remember this working for me in the not too distant past.
> I'm using git version 1.6.1.3.  Perhaps it was an older version of git
> when it worked for me.
>
> quadra% ls -l src/c/sock.c
> -rw-r--r-- 1 layer fi 57909 Mar  9 13:32 src/c/sock.c
> quadra% git show :2:src/c/sock.c
> fatal: ambiguous argument ':2:src/c/sock.c': unknown revision or path not in the working tree.
> Use '--' to separate paths from revisions
> quadra% git show :1:c/sock.c
> fatal: ambiguous argument ':1:c/sock.c': unknown revision or path not in the working tree.
> Use '--' to separate paths from revisions
> quadra% git show :1:sock.c
> fatal: ambiguous argument ':1:sock.c': unknown revision or path not in the working tree.
> Use '--' to separate paths from revisions
> quadra% git show :1:/src/c/sock.c
> fatal: ambiguous argument ':1:/src/c/sock.c': unknown revision or path not in the working tree.
> Use '--' to separate paths from revisions

Does the file have conflicts?  Try
  $ git ls-files -s src/c/sock.c
and report what the output is.

If it doesn't have conflicts, but the file is tracked by git, using
stage 0 should work:
  $ git show :0:src/c/sock.c