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
50b3c2d5
Commit
50b3c2d5
authored
Aug 30, 2021
by
Edward Thomson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
pack: don't assert in the lock
parent
e7eb6c6b
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
16 additions
and
3 deletions
+16
-3
src/pack.c
+16
-3
No files found.
src/pack.c
View file @
50b3c2d5
...
@@ -1298,7 +1298,12 @@ int git_pack_foreach_entry(
...
@@ -1298,7 +1298,12 @@ int git_pack_foreach_entry(
return
error
;
return
error
;
}
}
GIT_ASSERT
(
p
->
index_map
.
data
);
if
(
!
p
->
index_map
.
data
)
{
git_error_set
(
GIT_ERROR_INTERNAL
,
"internal error: p->index_map.data == NULL"
);
git_mutex_unlock
(
&
p
->
lock
);
return
-
1
;
}
index
=
p
->
index_map
.
data
;
index
=
p
->
index_map
.
data
;
if
(
p
->
index_version
>
1
)
if
(
p
->
index_version
>
1
)
...
@@ -1387,7 +1392,11 @@ int git_pack_foreach_entry_offset(
...
@@ -1387,7 +1392,11 @@ int git_pack_foreach_entry_offset(
if
((
error
=
pack_index_open_locked
(
p
))
<
0
)
if
((
error
=
pack_index_open_locked
(
p
))
<
0
)
goto
cleanup
;
goto
cleanup
;
GIT_ASSERT
(
p
->
index_map
.
data
);
if
(
!
p
->
index_map
.
data
)
{
git_error_set
(
GIT_ERROR_INTERNAL
,
"internal error: p->index_map.data == NULL"
);
goto
cleanup
;
}
index
=
p
->
index_map
.
data
;
index
=
p
->
index_map
.
data
;
}
}
...
@@ -1479,7 +1488,11 @@ static int pack_entry_find_offset(
...
@@ -1479,7 +1488,11 @@ static int pack_entry_find_offset(
if
((
error
=
pack_index_open_locked
(
p
))
<
0
)
if
((
error
=
pack_index_open_locked
(
p
))
<
0
)
goto
cleanup
;
goto
cleanup
;
GIT_ASSERT
(
p
->
index_map
.
data
);
if
(
!
p
->
index_map
.
data
)
{
git_error_set
(
GIT_ERROR_INTERNAL
,
"internal error: p->index_map.data == NULL"
);
goto
cleanup
;
}
index
=
p
->
index_map
.
data
;
index
=
p
->
index_map
.
data
;
level1_ofs
=
p
->
index_map
.
data
;
level1_ofs
=
p
->
index_map
.
data
;
...
...
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