diff options
author | Junio C Hamano <gitster@pobox.com> | 2007-11-14 14:15:40 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2007-11-14 14:15:40 -0800 |
commit | c78a24986d4d3faff810e87dbcd0ac99f0eabbce (patch) | |
tree | 29ceb2cf66c2454949d42dae7d8a70cb8f87d70e /check-racy.c | |
parent | ef4de8357dff57d403073572e8b260618bd03175 (diff) | |
parent | 25487bde2ab756a423489fc942b37c1550555b93 (diff) | |
download | git-c78a24986d4d3faff810e87dbcd0ac99f0eabbce.tar.gz |
Merge branch 'jc/maint-add-sync-stat'
* jc/maint-add-sync-stat:
t2200: test more cases of "add -u"
git-add: make the entry stat-clean after re-adding the same contents
ce_match_stat, run_diff_files: use symbolic constants for readability
Conflicts:
builtin-add.c
Diffstat (limited to 'check-racy.c')
-rw-r--r-- | check-racy.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/check-racy.c b/check-racy.c index d6a08b4a55..00d92a1663 100644 --- a/check-racy.c +++ b/check-racy.c @@ -18,7 +18,7 @@ int main(int ac, char **av) if (ce_match_stat(ce, &st, 0)) dirty++; - else if (ce_match_stat(ce, &st, 2)) + else if (ce_match_stat(ce, &st, CE_MATCH_RACY_IS_DIRTY)) racy++; else clean++; |