diff options
| author | Carlos Martín Nieto <cmn@dwim.me> | 2015-06-17 15:34:10 +0300 |
|---|---|---|
| committer | Carlos Martín Nieto <cmn@dwim.me> | 2015-06-22 13:47:30 +0300 |
| commit | ff47537557f0ac1919e77c5cb21f36f2e98425de (patch) | |
| tree | b7164edbbc40fcdea677c1d178c1052e7b197ef0 /tests/diff/workdir.c | |
| parent | e96a97f18e8f961c434e4fa4fc2c7d950480b9e9 (diff) | |
diff: check files with the same or newer timestamps
When a file on the workdir has the same or a newer timestamp than the
index, we need to perform a full check of the contents, as the update of
the file may have happened just after we wrote the index.
The iterator changes are such that we can reach inside the workdir
iterator from the diff, though it may be better to have an accessor
instead of moving these structs into the header.
Diffstat (limited to 'tests/diff/workdir.c')
| -rw-r--r-- | tests/diff/workdir.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/diff/workdir.c b/tests/diff/workdir.c index 6b72f3286..3ca82e733 100644 --- a/tests/diff/workdir.c +++ b/tests/diff/workdir.c @@ -1623,6 +1623,8 @@ void test_diff_workdir__can_update_index(void) /* now if we do it again, we should see fewer OID calculations */ + /* tick again as the index updating from the previous diff might have reset the timestamp */ + tick_index(index); basic_diff_status(&diff, &opts); cl_git_pass(git_diff_get_perfdata(&perf, diff)); |