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
9d160ba8
Commit
9d160ba8
authored
Mar 06, 2012
by
Vicent Martí
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
diff: Fix rebase breackage
parent
1a481123
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
6 additions
and
6 deletions
+6
-6
src/attr.c
+1
-1
src/iterator.c
+1
-1
src/odb_loose.c
+1
-1
src/repository.c
+1
-1
tests-clar/diff/diff_helpers.c
+2
-2
No files found.
src/attr.c
View file @
9d160ba8
...
...
@@ -235,7 +235,7 @@ int git_attr_cache__lookup_or_create_file(
return
GIT_SUCCESS
;
}
if
(
loader
&&
git_path_exists
(
filename
)
!=
GIT_SUCCESS
)
{
if
(
loader
&&
git_path_exists
(
filename
)
==
false
)
{
*
file_ptr
=
NULL
;
return
GIT_SUCCESS
;
}
...
...
src/iterator.c
View file @
9d160ba8
...
...
@@ -440,7 +440,7 @@ static int workdir_iterator__update_entry(workdir_iterator *wi)
/* detect submodules */
if
(
S_ISDIR
(
wi
->
entry
.
mode
)
&&
git_path_contains
(
&
wi
->
path
,
DOT_GIT
)
==
GIT_SUCCESS
)
git_path_contains
(
&
wi
->
path
,
DOT_GIT
)
==
true
)
wi
->
entry
.
mode
=
S_IFGITLINK
;
return
GIT_SUCCESS
;
...
...
src/odb_loose.c
View file @
9d160ba8
...
...
@@ -480,7 +480,7 @@ static int fn_locate_object_short_oid(void *state, git_buf *pathbuf) {
return
GIT_SUCCESS
;
}
if
(
git_path_isdir
(
pathbuf
->
ptr
)
==
tru
e
)
{
if
(
git_path_isdir
(
pathbuf
->
ptr
)
==
fals
e
)
{
/* We are already in the directory matching the 2 first hex characters,
* compare the first ncmp characters of the oids */
if
(
!
memcmp
(
sstate
->
short_oid
+
2
,
...
...
src/repository.c
View file @
9d160ba8
...
...
@@ -171,7 +171,7 @@ int git_repository_open(git_repository **repo_out, const char *path)
* of the working dir, by testing if it contains a `.git`
* folder inside of it.
*/
if
(
git_path_contains_dir
(
&
path_buf
,
GIT_DIR
)
==
GIT_SUCCESS
)
if
(
git_path_contains_dir
(
&
path_buf
,
GIT_DIR
)
==
true
)
git_buf_joinpath
(
&
path_buf
,
path_buf
.
ptr
,
GIT_DIR
);
if
(
quickcheck_repository_dir
(
&
path_buf
)
<
GIT_SUCCESS
)
{
...
...
tests-clar/diff/diff_helpers.c
View file @
9d160ba8
...
...
@@ -7,8 +7,8 @@ git_tree *resolve_commit_oid_to_tree(
{
size_t
len
=
strlen
(
partial_oid
);
git_oid
oid
;
git_object
*
obj
;
git_tree
*
tree
;
git_object
*
obj
=
NULL
;
git_tree
*
tree
=
NULL
;
if
(
git_oid_fromstrn
(
&
oid
,
partial_oid
,
len
)
==
0
)
git_object_lookup_prefix
(
&
obj
,
repo
,
&
oid
,
len
,
GIT_OBJ_ANY
);
...
...
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