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
fdd15bcf
Unverified
Commit
fdd15bcf
authored
3 years ago
by
Edward Thomson
Committed by
GitHub
3 years ago
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #6224 from libgit2/ethomson/v1.4.1
v1.4.1
parents
1d5b9bd8
ab791c83
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
11 additions
and
9 deletions
+11
-9
README.md
+2
-2
cmake/SelectHTTPParser.cmake
+1
-1
examples/commit.c
+2
-0
include/git2/version.h
+2
-2
src/xdiff/xdiff.h
+2
-2
src/xdiff/xmerge.c
+2
-2
No files found.
README.md
View file @
fdd15bcf
...
...
@@ -4,8 +4,8 @@ libgit2 - the Git linkable library
| Build Status | |
| ------------ | - |
|
**main**
branch CI builds |
[

](https://github.com/libgit2/libgit2/actions?query=workflow%3A%22CI+Build%22+event%3Apush) |
|
**v1.
2 branch**
CI builds |
[

](https://github.com/libgit2/libgit2/actions?query=workflow%3A%22CI+Build%22+event%3Apush+branch%3Amaint%2Fv1.2
) |
|
**v1.
1 branch**
CI builds |
[

](https://github.com/libgit2/libgit2/actions?query=workflow%3A%22CI+Build%22+event%3Apush+branch%3Amaint%2Fv1.1
) |
|
**v1.
4 branch**
CI builds |
[

](https://github.com/libgit2/libgit2/actions?query=workflow%3A%22CI+Build%22+event%3Apush+branch%3Amaint%2Fv1.4
) |
|
**v1.
3 branch**
CI builds |
[

](https://github.com/libgit2/libgit2/actions?query=workflow%3A%22CI+Build%22+event%3Apush+branch%3Amaint%2Fv1.3
) |
|
**Nightly**
builds |
[

](https://github.com/libgit2/libgit2/actions?query=workflow%3A%22Nightly+Build%22)
[

](https://scan.coverity.com/projects/639) |
`libgit2`
is a portable, pure C implementation of the Git core methods
...
...
This diff is collapsed.
Click to expand it.
cmake/SelectHTTPParser.cmake
View file @
fdd15bcf
# Optional external dependency: http-parser
if
(
USE_HTTP_PARSER STREQUAL
"system"
)
find_package
(
HTTP
_
Parser
)
find_package
(
HTTPParser
)
if
(
HTTP_PARSER_FOUND AND HTTP_PARSER_VERSION_MAJOR EQUAL 2
)
list
(
APPEND LIBGIT2_SYSTEM_INCLUDES
${
HTTP_PARSER_INCLUDE_DIRS
}
)
...
...
This diff is collapsed.
Click to expand it.
examples/commit.c
View file @
fdd15bcf
...
...
@@ -79,6 +79,8 @@ int lg2_commit(git_repository *repo, int argc, char **argv)
git_index_free
(
index
);
git_signature_free
(
signature
);
git_tree_free
(
tree
);
git_object_free
(
parent
);
git_reference_free
(
ref
);
return
error
;
}
This diff is collapsed.
Click to expand it.
include/git2/version.h
View file @
fdd15bcf
...
...
@@ -7,10 +7,10 @@
#ifndef INCLUDE_git_version_h__
#define INCLUDE_git_version_h__
#define LIBGIT2_VERSION "1.4.
0
"
#define LIBGIT2_VERSION "1.4.
1
"
#define LIBGIT2_VER_MAJOR 1
#define LIBGIT2_VER_MINOR 4
#define LIBGIT2_VER_REVISION
0
#define LIBGIT2_VER_REVISION
1
#define LIBGIT2_VER_PATCH 0
#define LIBGIT2_SOVERSION "1.4"
...
...
This diff is collapsed.
Click to expand it.
src/xdiff/xdiff.h
View file @
fdd15bcf
...
...
@@ -23,12 +23,12 @@
#if !defined(XDIFF_H)
#define XDIFF_H
#include "git-xdiff.h"
#ifdef __cplusplus
extern
"C"
{
#endif
/* #ifdef __cplusplus */
#include "git-xdiff.h"
/* xpparm_t.flags */
#define XDF_NEED_MINIMAL (1 << 0)
...
...
This diff is collapsed.
Click to expand it.
src/xdiff/xmerge.c
View file @
fdd15bcf
...
...
@@ -88,7 +88,7 @@ static int xdl_cleanup_merge(xdmerge_t *c)
if
(
c
->
mode
==
0
)
count
++
;
next_c
=
c
->
next
;
free
(
c
);
xdl_
free
(
c
);
}
return
count
;
}
...
...
@@ -456,7 +456,7 @@ static void xdl_merge_two_conflicts(xdmerge_t *m)
m
->
chg1
=
next_m
->
i1
+
next_m
->
chg1
-
m
->
i1
;
m
->
chg2
=
next_m
->
i2
+
next_m
->
chg2
-
m
->
i2
;
m
->
next
=
next_m
->
next
;
free
(
next_m
);
xdl_
free
(
next_m
);
}
/*
...
...
This diff is collapsed.
Click to expand it.
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