git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Christian Couder <chriscool@tuxfamily.org>
To: git@vger.kernel.org, Junio Hamano <junkio@cox.net>, krh@redhat.com
Subject: Possible d/f conflict bug or regression
Date: Sat, 29 Mar 2008 08:13:08 +0100	[thread overview]
Message-ID: <200803290813.08419.chriscool@tuxfamily.org> (raw)

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.

             reply	other threads:[~2008-03-29  7:08 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-03-29  7:13 Christian Couder [this message]
2008-03-29  8:01 ` Possible d/f conflict bug or regression Christian Couder
2008-03-30  1:29 ` Bryan Donlan
2008-03-30  4:44   ` Christian Couder
2008-03-30  4:51     ` Bryan Donlan
2008-03-30 23:46 ` Junio C Hamano
2008-03-31  0:28   ` [PATCH 1/3] Add corner case tests for diff-index and diff-files Junio C Hamano
2008-03-31  0:29   ` [PATCH 2/3] diff-index: careful when inspecting work tree items Junio C Hamano
2008-03-31  3:12     ` Junio C Hamano
2008-03-31  3:47       ` Christian Couder
2008-03-31  0:30   ` [PATCH 3/3] diff-files: " Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=200803290813.08419.chriscool@tuxfamily.org \
    --to=chriscool@tuxfamily.org \
    --cc=git@vger.kernel.org \
    --cc=junkio@cox.net \
    --cc=krh@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).