Commit 6abdf52d6eba71908f4389b14f9b7b3f1827f8c7

Edward Thomson 2016-03-07T09:37:51

merge::workdir::dirty: update to use `st_ctime_nsec` Update unit test to use newfangled `st_ctime_nsec`, which provides indirection to the platform-correct name.

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
diff --git a/tests/merge/workdir/dirty.c b/tests/merge/workdir/dirty.c
index 99e33e0..a69919f 100644
--- a/tests/merge/workdir/dirty.c
+++ b/tests/merge/workdir/dirty.c
@@ -165,8 +165,8 @@ static void hack_index(char *files[])
 		entry->ctime.seconds = (int32_t)statbuf.st_ctime;
 		entry->mtime.seconds = (int32_t)statbuf.st_mtime;
 #if defined(GIT_USE_NSEC)
-		entry->ctime.nanoseconds = statbuf.st_ctim.tv_nsec;
-		entry->mtime.nanoseconds = statbuf.st_mtim.tv_nsec;
+		entry->ctime.nanoseconds = statbuf.st_ctime_nsec;
+		entry->mtime.nanoseconds = statbuf.st_mtime_nsec;
 #else
 		entry->ctime.nanoseconds = 0;
 		entry->mtime.nanoseconds = 0;