From: Ping Yin <pkufranky@gmail.com>
To: git@vger.kernel.org
Cc: gitster@pobox.com, Ping Yin <pkufranky@gmail.com>
Subject: [PATCH 4/4] Fix ie_match_stat for non-checked-out submodule
Date: Fri, 2 May 2008 21:35:36 +0800 [thread overview]
Message-ID: <1209735336-4690-5-git-send-email-pkufranky@gmail.com> (raw)
In-Reply-To: <1209735336-4690-4-git-send-email-pkufranky@gmail.com>
For submodules non checked out, ie_match_stat should always return 0.
So in this case avoid calling is_racy_timestamp.
Signed-off-by: Ping Yin <pkufranky@gmail.com>
---
read-cache.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/read-cache.c b/read-cache.c
index a92b25b..8c9c8e2 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -294,7 +294,7 @@ int ie_match_stat(const struct index_state *istate,
* whose mtime are the same as the index file timestamp more
* carefully than others.
*/
- if (!changed && is_racy_timestamp(istate, ce)) {
+ if (!changed && !S_ISGITLINK(ce->ce_mode) && is_racy_timestamp(istate, ce)) {
if (assume_racy_is_modified)
changed |= DATA_CHANGED;
else
--
1.5.5.1.116.ge4b9c.dirty
next prev parent reply other threads:[~2008-05-02 13:36 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-04-22 11:01 [regression?] "git status -a" reports modified for empty submodule directory Ping Yin
2008-04-22 11:04 ` Ping Yin
2008-04-22 12:15 ` Johannes Sixt
2008-04-22 12:39 ` Ping Yin
2008-04-22 12:46 ` Johannes Sixt
2008-04-22 18:00 ` Roman Shaposhnik
2008-04-29 15:31 ` Ping Yin
2008-04-29 16:07 ` [PATCH 0/2] Add tests for submodule with empty directory Ping Yin
2008-04-29 16:07 ` [PATCH 1/2] t4027: test diff " Ping Yin
2008-04-29 16:07 ` [PATCH 2/2] Add t7506 to test submodule related functions for git-status Ping Yin
2008-04-29 21:40 ` [regression?] "git status -a" reports modified for empty submodule directory Junio C Hamano
2008-04-30 6:39 ` Johannes Sixt
2008-04-30 7:29 ` Junio C Hamano
2008-04-30 15:56 ` Ping Yin
2008-05-02 13:35 ` [PATCH 0/4] Fix regression for unchecked out submodules Ping Yin
2008-05-02 13:35 ` [PATCH 1/4] t4027: test diff for submodule with empty directory Ping Yin
2008-05-02 13:35 ` [PATCH 2/4] Add t7506 to test submodule related functions for git-status Ping Yin
2008-05-02 13:35 ` [PATCH 3/4] Fix diff regression for submodules not checked out Ping Yin
2008-05-02 13:35 ` Ping Yin [this message]
2008-05-02 21:57 ` [PATCH 4/4] Fix ie_match_stat for non-checked-out submodule Junio C Hamano
2008-05-02 23:34 ` Ping Yin
2008-05-02 22:23 ` [PATCH 3/4] Fix diff regression for submodules not checked out Junio C Hamano
2008-05-02 23:55 ` Ping Yin
2008-05-03 0:07 ` [PATCH] Rename ENT_INEXISTENT to ENT_NONEXISTENT Ping Yin
2008-05-03 12:36 ` [PATCH 3/4] Fix diff regression for submodules not checked out Johannes Schindelin
2008-05-03 16:59 ` Junio C Hamano
2008-05-04 6:45 ` Junio C Hamano
2008-05-04 7:10 ` Ping Yin
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=1209735336-4690-5-git-send-email-pkufranky@gmail.com \
--to=pkufranky@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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).