Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
git2
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lvzhengyang
git2
Commits
26432a9c
Commit
26432a9c
authored
Jun 20, 2015
by
Carlos Martín Nieto
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
tests: set racy times manually
parent
6c5eaead
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
26 additions
and
6 deletions
+26
-6
tests/diff/racy.c
+26
-6
No files found.
tests/diff/racy.c
View file @
26432a9c
...
...
@@ -2,6 +2,7 @@
#include "../checkout/checkout_helpers.h"
#include "buffer.h"
#include "index.h"
static
git_repository
*
g_repo
;
...
...
@@ -52,29 +53,48 @@ void test_diff_racy__write_index_just_after_file(void)
git_index
*
index
;
git_diff
*
diff
;
git_buf
path
=
GIT_BUF_INIT
;
struct
timeval
times
[
2
];
/* Make sure we do have a timestamp */
cl_git_pass
(
git_repository_index
(
&
index
,
g_repo
));
cl_git_pass
(
git_index_write
(
index
));
/* The timestamp will be one second before we change the file */
sleep
(
1
);
cl_git_pass
(
git_buf_joinpath
(
&
path
,
git_repository_workdir
(
g_repo
),
"A"
));
cl_git_mkfile
(
path
.
ptr
,
"A"
);
/* Force the file's timestamp to be a second after we wrote the index */
times
[
0
].
tv_sec
=
index
->
stamp
.
mtime
+
1
;
times
[
0
].
tv_usec
=
0
;
times
[
1
].
tv_sec
=
index
->
stamp
.
mtime
+
1
;
times
[
1
].
tv_usec
=
0
;
cl_git_pass
(
p_utimes
(
path
.
ptr
,
times
));
/*
* Put 'A' into the index, the size field will be filled,
* because the index' on-disk timestamp does not match the
* file's timestamp. Both timestamps will however match after
* writing out the index.
* file's timestamp.
*/
cl_git_pass
(
git_repository_index
(
&
index
,
g_repo
));
cl_git_pass
(
git_index_add_bypath
(
index
,
"A"
));
cl_git_pass
(
git_index_write
(
index
));
/* Change its contents quickly, so we get the same timestamp */
cl_git_mkfile
(
path
.
ptr
,
"B"
);
/*
* Pretend this index' modification happend a second after the
* file update, and rewrite the file in that same second.
*/
times
[
0
].
tv_sec
=
index
->
stamp
.
mtime
+
2
;
times
[
0
].
tv_usec
=
0
;
times
[
1
].
tv_sec
=
index
->
stamp
.
mtime
+
2
;
times
[
0
].
tv_usec
=
0
;
cl_git_pass
(
p_utimes
(
git_index_path
(
index
),
times
));
cl_git_pass
(
p_utimes
(
path
.
ptr
,
times
));
cl_git_pass
(
git_index_read
(
index
,
true
));
cl_git_pass
(
git_diff_index_to_workdir
(
&
diff
,
g_repo
,
index
,
NULL
));
cl_assert_equal_i
(
1
,
git_diff_num_deltas
(
diff
));
git_buf_free
(
&
path
);
git_diff_free
(
diff
);
git_index_free
(
index
);
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment