Re: git-diff-index -C problem

From: Shawn O. Pearce <spearce@spearce.org>
Date: Jun 18, 2007, 06:26 UTC
Message-ID: <20070618062641.GK18491@spearce.org>
In-Reply-To: <69b0c0350706172248l6343e4c6yfd36ced8230a11ef@mail.gmail.com>

Govind Salinas <govindsalinas@gmail.com> wrote:

Show 8 quoted lines

> I am writing a porcelain for git and I have been playing with
> git-diff-index. I noticed that if i copy a file and git-add the copy
> it shows the file added, as i expect...
> 
> But then if i then say git-add on the original file, i expect that -C
> would check that file to see if it was copied, it does not.  If i
> touch the file, then git detects the copy, so git-add is not forcing
> git to consider the file modified.

Oddly enough if you add --find-copies-harder Git does actually find the copy then, without needing to make the file stat-dirty in the index.

  $ rm -rf foo;mkdir foo;cd foo;git init
  Initialized empty Git repository in .git/

  $ echo hello >a;git add a; git commit -m a
  Created initial commit 9d2537b: a
   1 files changed, 1 insertions(+), 0 deletions(-)
   create mode 100644 a

  $ cp a b;git add b
  $ git diff-index --abbrev HEAD
  :000000 100644 0000000... ce01362... A  b
  $ git diff-index --abbrev -C HEAD
  :000000 100644 0000000... ce01362... A  b
  $ git diff-index --abbrev -C --find-copies-harder HEAD
  :100644 100644 ce01362... ce01362... C100       a       b

  $ touch a
  $ git diff-index --abbrev -C HEAD
  :100644 100644 ce01362... 0000000... M  a
  :100644 100644 ce01362... ce01362... C100       a       b

I *think* the reason this happens is because -C means to find a copy among the other modified files. Because "a" was not modified (unless it is stat-dirty or otherwise modified) then "b" is not a copy of it.

The --find-copies-harder makes us also look at the unmodified files, and there we find the copy.

Indeed, the documentation says exactly that:

  --find-copies-harder::
      For performance reasons, by default, `-C` option finds copies only
      if the original file of the copy was modified in the same
      changeset.  This flag makes the command
      inspect unmodified files as candidates for the source of
      copy.  This is a very expensive operation for large
      projects, so use it with caution.  Giving more than one
      `-C` option has the same effect.

So what you are seeing is actually as designed, and documented.

-- 
Shawn.