git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Salikh Zakirov <salikh@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: git-commit goes awry after git-add -u
Date: Wed, 15 Aug 2007 13:49:30 -0700	[thread overview]
Message-ID: <7v643gplph.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <f9v1t6$uph$1@sea.gmane.org> (Salikh Zakirov's message of "Wed, 15 Aug 2007 23:16:59 +0900")

Salikh Zakirov <salikh@gmail.com> writes:

> I have observed incorret behaviour of git-commit after git-add -u, where
> it records deletions of files not related to the files touched by commit.

Does this fix the issue?

Ideally remove_file_from_cache() should have the invalidate call
inside just like add_file_to_cache() does, but there was a
technical reason it couldn't that I do not recall offhand, so I
am playing it safe here with this tentative patch to see if the
cause is a cache-tree corruption.

---
 builtin-add.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/builtin-add.c b/builtin-add.c
index 1591171..a5fae7c 100644
--- a/builtin-add.c
+++ b/builtin-add.c
@@ -115,6 +115,7 @@ static void update_callback(struct diff_queue_struct *q,
 			break;
 		case DIFF_STATUS_DELETED:
 			remove_file_from_cache(path);
+			cache_tree_invalidate_path(active_cache_tree, path);
 			if (verbose)
 				printf("remove '%s'\n", path);
 			break;

  parent reply	other threads:[~2007-08-15 20:50 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-08-15 14:16 git-commit goes awry after git-add -u Salikh Zakirov
2007-08-15 14:21 ` Salikh Zakirov
2007-08-15 20:49 ` Junio C Hamano [this message]
2007-08-15 21:12   ` [PATCH] Fix "git add -u" data corruption Junio C Hamano
2007-08-16  0:15     ` Zakirov Salikh
2007-08-15 23:43   ` git-commit goes awry after git-add -u Salikh Zakirov

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=7v643gplph.fsf@gitster.siamese.dyndns.org \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=salikh@gmail.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).