From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 4 May 2008 00:24:28 +0000 (-0700)
Subject: is_racy_timestamp(): do not check timestamp for gitlinks
X-Git-Tag: v1.5.6-rc0~68^2~2^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=050288d52dc5dc3f6c7716007c1069dd9f59feb7;p=git.git

is_racy_timestamp(): do not check timestamp for gitlinks

Because we do not even check the timestamp to determie if a gitlink
is up to date or not, triggering the racy-timestamp check for gitlinks
does not make sense.

This fixes the recently added test in t7506.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/read-cache.c b/read-cache.c
index a92b25b59..9ee125597 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -257,7 +257,8 @@ static int ce_match_stat_basic(struct cache_entry *ce, struct stat *st)
 
 static int is_racy_timestamp(const struct index_state *istate, struct cache_entry *ce)
 {
-	return (istate->timestamp &&
+	return (!S_ISGITLINK(ce->ce_mode) &&
+		istate->timestamp &&
 		((unsigned int)istate->timestamp) <= ce->ce_mtime);
 }
 
diff --git a/t/t7506-status-submodule.sh b/t/t7506-status-submodule.sh
index 8987c9eb7..a75130cdb 100755
--- a/t/t7506-status-submodule.sh
+++ b/t/t7506-status-submodule.sh
@@ -30,7 +30,7 @@ test_expect_success 'status clean (empty submodule dir)' '
 	git status |
 	grep "nothing to commit"
 '
-test_expect_failure 'status -a clean (empty submodule dir)' '
+test_expect_success 'status -a clean (empty submodule dir)' '
 	git status -a |
 	grep "nothing to commit"
 '