Browse Source

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>
maint
Junio C Hamano 17 years ago
parent
commit
050288d52d
  1. 3
      read-cache.c
  2. 2
      t/t7506-status-submodule.sh

3
read-cache.c

@ -257,7 +257,8 @@ static int ce_match_stat_basic(struct cache_entry *ce, struct stat *st) @@ -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);
}


2
t/t7506-status-submodule.sh

@ -30,7 +30,7 @@ test_expect_success 'status clean (empty submodule dir)' ' @@ -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"
'

Loading…
Cancel
Save