Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit3f4182d

Browse files
authored
Merge pull request#6936 from libgit2/ethomson/v1.8.4
libgit2 v1.8.4
2 parents3353f78 +73644b3 commit3f4182d

File tree

21 files changed

+55
-37
lines changed

21 files changed

+55
-37
lines changed

‎CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
cmake_minimum_required(VERSION3.5.1)
88

9-
project(libgit2VERSION"1.8.3"LANGUAGESC)
9+
project(libgit2VERSION"1.8.4"LANGUAGESC)
1010

1111
# Add find modules to the path
1212
set(CMAKE_MODULE_PATH${CMAKE_MODULE_PATH}"${PROJECT_SOURCE_DIR}/cmake")

‎docs/changelog.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
v1.8.4
2+
------
3+
4+
We erroneously shipped v1.8.3 without actually including the change
5+
in v1.8.2. This release re-re-introduces the pre-v1.8.0`commit`
6+
constness behavior.
7+
8+
##What's Changed
9+
10+
###Bug fixes
11+
12+
* Fix constness issue introduced in#6716 by@ethomson inhttps://github.com/libgit2/libgit2/pull/6829
13+
14+
**Full Changelog**:https://github.com/libgit2/libgit2/compare/v1.8.3...v1.8.4
15+
116
v1.8.3
217
------
318

‎examples/merge.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ static int create_merge_commit(git_repository *repo, git_index *index, struct me
263263
sign,sign,
264264
NULL,msg,
265265
tree,
266-
opts->annotated_count+1,parents);
266+
opts->annotated_count+1,(constgit_commit**)parents);
267267
check_lg2(err,"failed to create commit",NULL);
268268

269269
/* We're done merging, cleanup the repository state */

‎include/git2/commit.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@ GIT_EXTERN(int) git_commit_create(
366366
constchar*message,
367367
constgit_tree*tree,
368368
size_tparent_count,
369-
git_commit*constparents[]);
369+
constgit_commit*parents[]);
370370

371371
/**
372372
* Create new commit in the repository using a variable argument list.
@@ -512,7 +512,7 @@ GIT_EXTERN(int) git_commit_create_buffer(
512512
constchar*message,
513513
constgit_tree*tree,
514514
size_tparent_count,
515-
git_commit*constparents[]);
515+
constgit_commit*parents[]);
516516

517517
/**
518518
* Create a commit object from the given buffer and signature
@@ -581,7 +581,7 @@ typedef int (*git_commit_create_cb)(
581581
constchar*message,
582582
constgit_tree*tree,
583583
size_tparent_count,
584-
git_commit*constparents[],
584+
constgit_commit*parents[],
585585
void*payload);
586586

587587
/** An array of commits returned from the library */

‎include/git2/version.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
* The version string for libgit2. This string follows semantic
1212
* versioning (v2) guidelines.
1313
*/
14-
#defineLIBGIT2_VERSION "1.8.3"
14+
#defineLIBGIT2_VERSION "1.8.4"
1515

1616
/** The major version number for this version of libgit2. */
1717
#defineLIBGIT2_VER_MAJOR 1
@@ -20,7 +20,7 @@
2020
#defineLIBGIT2_VER_MINOR 8
2121

2222
/** The revision ("teeny") version number for this version of libgit2. */
23-
#defineLIBGIT2_VER_REVISION3
23+
#defineLIBGIT2_VER_REVISION4
2424

2525
/** The Windows DLL patch number for this version of libgit2. */
2626
#defineLIBGIT2_VER_PATCH 0

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name":"libgit2",
3-
"version":"1.8.3",
3+
"version":"1.8.4",
44
"repo":"https://github.com/libgit2/libgit2",
55
"description":" A cross-platform, linkable library implementation of Git that you can use in your application.",
66
"install":"mkdir build && cd build && cmake .. && cmake --build ."

‎src/libgit2/commit.c

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ int git_commit_create_from_ids(
281281

282282
typedefstruct {
283283
size_ttotal;
284-
git_commit*const*parents;
284+
constgit_commit**parents;
285285
git_repository*repo;
286286
}commit_parent_data;
287287

@@ -307,7 +307,7 @@ int git_commit_create(
307307
constchar*message,
308308
constgit_tree*tree,
309309
size_tparent_count,
310-
git_commit*constparents[])
310+
constgit_commit*parents[])
311311
{
312312
commit_parent_datadata= {parent_count,parents,repo };
313313

@@ -945,7 +945,7 @@ int git_commit_create_buffer(
945945
constchar*message,
946946
constgit_tree*tree,
947947
size_tparent_count,
948-
git_commit*constparents[])
948+
constgit_commit*parents[])
949949
{
950950
GIT_BUF_WRAP_PRIVATE(out,git_commit__create_buffer,repo,
951951
author,committer,message_encoding,message,
@@ -961,7 +961,7 @@ int git_commit__create_buffer(
961961
constchar*message,
962962
constgit_tree*tree,
963963
size_tparent_count,
964-
git_commit*constparents[])
964+
constgit_commit*parents[])
965965
{
966966
interror;
967967
commit_parent_datadata= {parent_count,parents,repo };
@@ -1150,7 +1150,8 @@ int git_commit_create_from_stage(
11501150

11511151
error=git_commit_create(out,repo,"HEAD",author,committer,
11521152
opts.message_encoding,message,
1153-
tree,parents.count,parents.commits);
1153+
tree,parents.count,
1154+
(constgit_commit**)parents.commits);
11541155

11551156
done:
11561157
git_commitarray_dispose(&parents);

‎src/libgit2/commit.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ int git_commit__create_buffer(
6464
constchar*message,
6565
constgit_tree*tree,
6666
size_tparent_count,
67-
git_commit*constparents[]);
67+
constgit_commit*parents[]);
6868

6969
intgit_commit__parse(
7070
void*commit,

‎src/libgit2/notes.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ static int note_write(
303303

304304
error=git_commit_create(&oid,repo,notes_ref,author,committer,
305305
NULL,GIT_NOTES_DEFAULT_MSG_ADD,
306-
tree,*parents==NULL ?0 :1,parents);
306+
tree,*parents==NULL ?0 :1,(constgit_commit**)parents);
307307

308308
if (notes_commit_out)
309309
git_oid_cpy(notes_commit_out,&oid);
@@ -394,7 +394,7 @@ static int note_remove(
394394
NULL,GIT_NOTES_DEFAULT_MSG_RM,
395395
tree_after_removal,
396396
*parents==NULL ?0 :1,
397-
parents);
397+
(constgit_commit**)parents);
398398

399399
if (error<0)
400400
gotocleanup;

‎src/libgit2/rebase.c

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -952,7 +952,7 @@ static int create_signed(
952952
constchar*message,
953953
git_tree*tree,
954954
size_tparent_count,
955-
git_commit*const*parents)
955+
constgit_commit**parents)
956956
{
957957
git_strcommit_content=GIT_STR_INIT;
958958
git_bufcommit_signature= {NULL,0,0 },
@@ -1040,7 +1040,8 @@ static int rebase_commit__create(
10401040
if (rebase->options.commit_create_cb) {
10411041
error=rebase->options.commit_create_cb(&commit_id,
10421042
author,committer,message_encoding,message,
1043-
tree,1,&parent_commit,rebase->options.payload);
1043+
tree,1, (constgit_commit**)&parent_commit,
1044+
rebase->options.payload);
10441045

10451046
git_error_set_after_callback_function(error,
10461047
"commit_create_cb");
@@ -1049,14 +1050,14 @@ static int rebase_commit__create(
10491050
elseif (rebase->options.signing_cb) {
10501051
error=create_signed(&commit_id,rebase,author,
10511052
committer,message_encoding,message,tree,
1052-
1,&parent_commit);
1053+
1,(constgit_commit**)&parent_commit);
10531054
}
10541055
#endif
10551056

10561057
if (error==GIT_PASSTHROUGH)
10571058
error=git_commit_create(&commit_id,rebase->repo,NULL,
10581059
author,committer,message_encoding,message,
1059-
tree,1,&parent_commit);
1060+
tree,1,(constgit_commit**)&parent_commit);
10601061

10611062
if (error)
10621063
gotodone;

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp