git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Possible d/f conflict bug or regression

From
Christian Couder <chriscool@tuxfamily.org>
Date
Mar 29, 2008, 07:13 UTC
Message-ID
<200803290813.08419.chriscool@tuxfamily.org>
Hi,
When doing something like:
mkdir testdir &&
        cd testdir &&
        touch foo &&
        git init &&
        git add . &&
        git commit -m 'Initial commit.' &&
        rm foo &&
        mkdir foo &&
        git commit -a -m 'Test.'
I get:
Initialized empty Git repository in .git/
Created initial commit 3f945ca: Initial commit.
 0 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 foo
fatal: unable to index file foo
I think it's quite bad that it doesn't work.

It seems it also doesn't work when adding "touch foo/bar" before "git commit -a -m 'Test.'".

I used:

$ git --version git version 1.5.5.rc2

It worked with 1.5.3 and I bisected it to the git commit port to C:
commit f5bbc3225c4b073a7ff3218164a0c820299bc9c6
Author: Kristian H<C3><B8>gsberg <krh@redhat.com>
Date:   Thu Nov 8 11:59:00 2007 -0500
    Port git commit to C.
    This makes git commit a builtin and moves git-commit.sh to
    contrib/examples.  This also removes the git-runstatus
    helper, which was mostly just a git-status.sh implementation detail.
    Signed-off-by: Kristian H<C3><B8>gsberg <krh@redhat.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>

Thanks, Christian.

Next: Christian Couder
Message 1 of 11 in “Possible d/f conflict bug or regression”
  1. Christian CouderMar 29, 2008
  2. Christian CouderMar 29, 2008
  3. Bryan DonlanMar 30, 2008
  4. Christian CouderMar 30, 2008
  5. Bryan DonlanMar 30, 2008
  6. Junio C HamanoMar 30, 2008
  7. 1/3 Add corner case tests for diff-index and diff-filesJunio C Hamano, Mar 31, 2008
  8. 2/3 diff-index: careful when inspecting work tree itemsJunio C Hamano, Mar 31, 2008
  9. Junio C HamanoMar 31, 2008
  10. Christian CouderMar 31, 2008
  11. 3/3 diff-files: careful when inspecting work tree itemsJunio C Hamano, Mar 31, 2008

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.