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
2a406ab5
Commit
2a406ab5
authored
Jun 18, 2011
by
Vicent Marti
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
config: Fix sorting of repository config files
parent
19cb6857
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
4 deletions
+3
-4
src/repository.c
+2
-2
tests/t15-config.c
+1
-2
No files found.
src/repository.c
View file @
2a406ab5
...
@@ -287,7 +287,7 @@ int git_repository_config(
...
@@ -287,7 +287,7 @@ int git_repository_config(
return
error
;
return
error
;
git__joinpath
(
config_path
,
repo
->
path_repository
,
GIT_CONFIG_FILENAME_INREPO
);
git__joinpath
(
config_path
,
repo
->
path_repository
,
GIT_CONFIG_FILENAME_INREPO
);
error
=
git_config_add_file_ondisk
(
*
out
,
config_path
,
1
);
error
=
git_config_add_file_ondisk
(
*
out
,
config_path
,
3
);
if
(
error
<
GIT_SUCCESS
)
if
(
error
<
GIT_SUCCESS
)
goto
cleanup
;
goto
cleanup
;
...
@@ -298,7 +298,7 @@ int git_repository_config(
...
@@ -298,7 +298,7 @@ int git_repository_config(
}
}
if
(
system_config_path
!=
NULL
)
{
if
(
system_config_path
!=
NULL
)
{
error
=
git_config_add_file_ondisk
(
*
out
,
system_config_path
,
3
);
error
=
git_config_add_file_ondisk
(
*
out
,
system_config_path
,
1
);
if
(
error
<
GIT_SUCCESS
)
if
(
error
<
GIT_SUCCESS
)
goto
cleanup
;
goto
cleanup
;
}
}
...
...
tests/t15-config.c
View file @
2a406ab5
...
@@ -189,8 +189,7 @@ BEGIN_TEST(config8, "don't fail on empty files")
...
@@ -189,8 +189,7 @@ BEGIN_TEST(config8, "don't fail on empty files")
git_config_free
(
cfg
);
git_config_free
(
cfg
);
END_TEST
END_TEST
BEGIN_TEST
BEGIN_TEST
(
config9
,
"replace a value"
)
(
config9
,
"replace a value"
)
git_config
*
cfg
;
git_config
*
cfg
;
int
i
;
int
i
;
...
...
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