threads / bug / 29420

[BUG] "git diff FILE BRANCH:FILE" erroneously report FILE does not exist in BRANCH

Subject: [BUG] "git diff FILE BRANCH:FILE" erroneously report FILE does not exist in BRANCH

## tl;dr

3 messages between Jan 21, 2012 and Jan 21, 2012.

replies: 2people: 3as markdown or json

Stefano Lattarini· Jan 21, 2012, 19:36 UTC · lore

Here is a complete reproducer for the bug:

mkdir foo \
  && cd foo \
  && git init . \
  && >README \
  && git add README \
  && git commit -m "for all" \
  && git checkout -b devel \
  && echo dev > README \
  && git add README \
  && git commit -m "for developers" \
  && git diff devel:README master:README \
  && git diff README master:README

I'd expect the last "git diff" to report the same diffs as the previous one; instead, it errors out with this bogus message:

  fatal: Path 'README' exists on disk, but not in 'master'.

Behaviour verified with git version 1.7.7.3 (installed from official Debian packages) and the latest git development version (1.7.9.rc0.69.gbddcef, from master).

Regards, and thanks for your amazing software,
  Stefano

Carlos Martín Nieto· Jan 21, 2012, 21:33 UTC · re: Stefano Lattarini · lore

Re: [BUG] "git diff FILE BRANCH:FILE" erroneously report FILE does not exist in BRANCH

On Sat, 2012-01-21 at 20:36 +0100, Stefano Lattarini wrote:

Show 9 quoted lines

> I'd expect the last "git diff" to report the same diffs as the previous one;
> instead, it errors out with this bogus message:
> 
>   fatal: Path 'README' exists on disk, but not in 'master'.
> 
> Behaviour verified with git version 1.7.7.3 (installed from official Debian
> packages) and the latest git development version (1.7.9.rc0.69.gbddcef, from
> master).
>

See http://thread.gmane.org/gmane.comp.version-control.git/188355 for earlier discussion. I haven't gotten around to see if I can fix it without upsetting too much code.

cmn

Junio C Hamano· Jan 21, 2012, 22:08 UTC · re: Stefano Lattarini · lore

Re: [BUG] "git diff FILE BRANCH:FILE" erroneously report FILE does not exist in BRANCH

Stefano Lattarini <stefano.lattarini@gmail.com> writes:

>   && git diff README master:README

http://thread.gmane.org/gmane.comp.version-control.git/188355/focus=188414