From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 14 Jun 2012 23:14:26 GMT
Subject: Re: Confusing error message
Message-ID: <7v395xebal.fsf@alter.siamese.dyndns.org>
In-Reply-To: <CABURp0qE+qJjyrhRFb8-gWucM0=3TpYwDBsnbCPrZNVe3QGQBQ@mail.gmail.com>

Phil Hord <phil.hord@gmail.com> writes:

> I messed something up during a rebase in a moved file (probably
> because I had rename detection turned off).  So now I want to fix it.
>
> I think I have the commit amended right, but to be sure I want to diff
> the old file and the new file.
>
>   $ git diff newfile HEAD^:oldfile
>   fatal: Path 'oldfile' exists, but not 'oldfile'.
>   Did you mean 'HEAD^:oldfile' aka 'HEAD^:./oldfile'?

You can feed two blob object names to "git diff", but I do not think
there is any provision to compare a blob object and a file in the
working tree.