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
34bd5999
Commit
34bd5999
authored
May 02, 2013
by
Carlos Martín Nieto
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Protect sha1_entry_pos call with mutex"
This reverts commit
8c535f3f
.
parent
d966310c
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
12 deletions
+10
-12
src/pack.c
+10
-12
No files found.
src/pack.c
View file @
34bd5999
...
@@ -1050,24 +1050,24 @@ static int pack_entry_find_offset(
...
@@ -1050,24 +1050,24 @@ static int pack_entry_find_offset(
const
git_oid
*
short_oid
,
const
git_oid
*
short_oid
,
size_t
len
)
size_t
len
)
{
{
const
uint32_t
*
level1_ofs
;
const
uint32_t
*
level1_ofs
=
p
->
index_map
.
data
;
const
unsigned
char
*
index
;
const
unsigned
char
*
index
=
p
->
index_map
.
data
;
unsigned
hi
,
lo
,
stride
;
unsigned
hi
,
lo
,
stride
;
int
pos
,
found
=
0
;
int
pos
,
found
=
0
;
const
unsigned
char
*
current
=
0
;
const
unsigned
char
*
current
=
0
;
*
offset_out
=
0
;
*
offset_out
=
0
;
if
(
!
p
->
index_map
.
data
&&
pack_index_open
(
p
)
<
0
)
if
(
index
==
NULL
)
{
return
git_odb__error_notfound
(
"failed to open packfile"
,
NULL
);
int
error
;
if
(
git_mutex_lock
(
&
p
->
lock
)
<
0
)
return
packfile_error
(
"failed to get lock for finding entry offset"
);
assert
(
p
->
index_map
.
data
);
if
((
error
=
pack_index_open
(
p
))
<
0
)
return
error
;
assert
(
p
->
index_map
.
data
);
index
=
p
->
index_map
.
data
;
index
=
p
->
index_map
.
data
;
level1_ofs
=
p
->
index_map
.
data
;
level1_ofs
=
p
->
index_map
.
data
;
}
if
(
p
->
index_version
>
1
)
{
if
(
p
->
index_version
>
1
)
{
level1_ofs
+=
2
;
level1_ofs
+=
2
;
...
@@ -1093,8 +1093,6 @@ static int pack_entry_find_offset(
...
@@ -1093,8 +1093,6 @@ static int pack_entry_find_offset(
/* Use git.git lookup code */
/* Use git.git lookup code */
pos
=
sha1_entry_pos
(
index
,
stride
,
0
,
lo
,
hi
,
p
->
num_objects
,
short_oid
->
id
);
pos
=
sha1_entry_pos
(
index
,
stride
,
0
,
lo
,
hi
,
p
->
num_objects
,
short_oid
->
id
);
git_mutex_unlock
(
&
p
->
lock
);
if
(
pos
>=
0
)
{
if
(
pos
>=
0
)
{
/* An object matching exactly the oid was found */
/* An object matching exactly the oid was found */
found
=
1
;
found
=
1
;
...
...
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