equal
deleted
inserted
replaced
445 &t->mtime_ns)) { |
445 &t->mtime_ns)) { |
446 return NULL; |
446 return NULL; |
447 } |
447 } |
448 if (t->flags & dirstate_flag_expected_state_is_modified) { |
448 if (t->flags & dirstate_flag_expected_state_is_modified) { |
449 t->flags &= ~(dirstate_flag_expected_state_is_modified | |
449 t->flags &= ~(dirstate_flag_expected_state_is_modified | |
450 dirstate_flag_has_meaningful_data | |
|
451 dirstate_flag_has_mtime); |
|
452 } |
|
453 if (t->flags & dirstate_flag_mtime_second_ambiguous) { |
|
454 /* The current code is not able to do the more subtle comparison |
|
455 * that the MTIME_SECOND_AMBIGUOUS requires. So we ignore the |
|
456 * mtime */ |
|
457 t->flags &= ~(dirstate_flag_mtime_second_ambiguous | |
|
458 dirstate_flag_has_meaningful_data | |
450 dirstate_flag_has_meaningful_data | |
459 dirstate_flag_has_mtime); |
451 dirstate_flag_has_mtime); |
460 } |
452 } |
461 t->mode = 0; |
453 t->mode = 0; |
462 if (t->flags & dirstate_flag_has_meaningful_data) { |
454 if (t->flags & dirstate_flag_has_meaningful_data) { |