rugged 0.25.1 → 0.25.1.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (9) hide show
  1. checksums.yaml +4 -4
  2. data/ext/rugged/rugged_tree.c +3 -1
  3. data/lib/rugged/version.rb +1 -1
  4. data/vendor/libgit2/CMakeLists.txt +12 -13
  5. data/vendor/libgit2/include/git2/version.h +2 -2
  6. data/vendor/libgit2/src/odb_mempack.c +1 -0
  7. data/vendor/libgit2/src/openssl_stream.h +1 -1
  8. data/vendor/libgit2/src/rebase.c +1 -1
  9. metadata +75 -75
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 6ec5164b83d057969697f3f9be23a9e908e54a2b
4
- data.tar.gz: 9fbd0c6b51a94b8999691c4dfae404ec94e3b1ff
3
+ metadata.gz: 8896b74252b35510af887c426c515e6abe35e6c4
4
+ data.tar.gz: 8306ac916e4e642ba76a01de227fb2ea97e3540e
5
5
  SHA512:
6
- metadata.gz: 3ae5843efb4f94a4eae1ab37e2c657206a73ade6fc3c5525feb507589609f74059182b30946a8e674665c27765db1fc60c5ce405fe734baacf568f92658444fc
7
- data.tar.gz: 8c2abf82e42b5f0f20f4482c9bb6266621ce525a11b9a05dce36c1992637bee6cc710219711cc4bdb655e694ba3b746269284ba484efb63d681f69853771b0c4
6
+ metadata.gz: 47ccd1925cde215bfe6c650cd84c1916c98fe122b31cd363d852d144b696182310939feac2cb66e15b98d6008d13ece94d154d4b75c194959720291353a1f455
7
+ data.tar.gz: d5a2615583cac6794e30c26d01041b1c0fa0605ccfef5f581e0099fc5ae94ac1e4c941cae432edfa8c4b4e2d8aa8841e7a29c6b4f91c0bdb9c09fac8aaad220b
data/ext/rugged/rugged_tree.c CHANGED
@@ -391,7 +391,9 @@ static VALUE rb_git_diff_tree_to_tree(VALUE self, VALUE rb_repo, VALUE rb_tree,
391
391
  struct nogvl_diff_args args;
392
392
 
393
393
  Data_Get_Struct(rb_repo, git_repository, repo);
394
- Data_Get_Struct(rb_tree, git_tree, tree);
394
+
395
+ if(RTEST(rb_tree))
396
+ Data_Get_Struct(rb_tree, git_tree, tree);
395
397
 
396
398
  if(RTEST(rb_other_tree))
397
399
  Data_Get_Struct(rb_other_tree, git_tree, other_tree);
data/lib/rugged/version.rb CHANGED
@@ -4,5 +4,5 @@
4
4
  # For full terms see the included LICENSE file.
5
5
 
6
6
  module Rugged
7
- Version = VERSION = '0.25.1'
7
+ Version = VERSION = '0.25.1.1'
8
8
  end
data/vendor/libgit2/CMakeLists.txt CHANGED
@@ -237,8 +237,6 @@ ENDIF()
237
237
 
238
238
  IF (WIN32 AND WINHTTP)
239
239
  ADD_DEFINITIONS(-DGIT_WINHTTP)
240
- INCLUDE_DIRECTORIES(deps/http-parser)
241
- FILE(GLOB SRC_HTTP deps/http-parser/*.c deps/http-parser/*.h)
242
240
 
243
241
  # Since MinGW does not come with headers or an import library for winhttp,
244
242
  # we have to include a private header and generate our own import library
@@ -291,17 +289,6 @@ ELSE ()
291
289
  LINK_LIBRARIES(${CURL_LIBRARIES})
292
290
  LIST(APPEND LIBGIT2_PC_LIBS ${CURL_LDFLAGS})
293
291
  ENDIF()
294
-
295
- FIND_PACKAGE(HTTP_Parser)
296
- IF (HTTP_PARSER_FOUND AND HTTP_PARSER_VERSION_MAJOR EQUAL 2)
297
- INCLUDE_DIRECTORIES(${HTTP_PARSER_INCLUDE_DIRS})
298
- LINK_LIBRARIES(${HTTP_PARSER_LIBRARIES})
299
- LIST(APPEND LIBGIT2_PC_LIBS "-lhttp_parser")
300
- ELSE()
301
- MESSAGE(STATUS "http-parser was not found or is too old; using bundled 3rd-party sources.")
302
- INCLUDE_DIRECTORIES(deps/http-parser)
303
- FILE(GLOB SRC_HTTP deps/http-parser/*.c deps/http-parser/*.h)
304
- ENDIF()
305
292
  ENDIF()
306
293
 
307
294
  # Specify sha1 implementation
@@ -332,6 +319,18 @@ IF(WIN32 OR AMIGA OR CMAKE_SYSTEM_NAME MATCHES "(Solaris|SunOS)")
332
319
  SET(SRC_REGEX deps/regex/regex.c)
333
320
  ENDIF()
334
321
 
322
+ # Optional external dependency: http-parser
323
+ FIND_PACKAGE(HTTP_Parser)
324
+ IF (HTTP_PARSER_FOUND AND HTTP_PARSER_VERSION_MAJOR EQUAL 2)
325
+ INCLUDE_DIRECTORIES(${HTTP_PARSER_INCLUDE_DIRS})
326
+ LINK_LIBRARIES(${HTTP_PARSER_LIBRARIES})
327
+ LIST(APPEND LIBGIT2_PC_LIBS "-lhttp_parser")
328
+ ELSE()
329
+ MESSAGE(STATUS "http-parser version 2 was not found; using bundled 3rd-party sources.")
330
+ INCLUDE_DIRECTORIES(deps/http-parser)
331
+ FILE(GLOB SRC_HTTP deps/http-parser/*.c deps/http-parser/*.h)
332
+ ENDIF()
333
+
335
334
  # Optional external dependency: zlib
336
335
  FIND_PACKAGE(ZLIB)
337
336
  IF (ZLIB_FOUND)
data/vendor/libgit2/include/git2/version.h CHANGED
@@ -7,10 +7,10 @@
7
7
  #ifndef INCLUDE_git_version_h__
8
8
  #define INCLUDE_git_version_h__
9
9
 
10
- #define LIBGIT2_VERSION "0.25.1"
10
+ #define LIBGIT2_VERSION "0.25.0"
11
11
  #define LIBGIT2_VER_MAJOR 0
12
12
  #define LIBGIT2_VER_MINOR 25
13
- #define LIBGIT2_VER_REVISION 1
13
+ #define LIBGIT2_VER_REVISION 0
14
14
  #define LIBGIT2_VER_PATCH 0
15
15
 
16
16
  #define LIBGIT2_SOVERSION 25
data/vendor/libgit2/src/odb_mempack.c CHANGED
@@ -177,6 +177,7 @@ int git_mempack_new(git_odb_backend **out)
177
177
 
178
178
  db->objects = git_oidmap_alloc();
179
179
 
180
+ db->parent.version = GIT_ODB_BACKEND_VERSION;
180
181
  db->parent.read = &impl__read;
181
182
  db->parent.write = &impl__write;
182
183
  db->parent.read_header = &impl__read_header;
data/vendor/libgit2/src/openssl_stream.h CHANGED
@@ -27,7 +27,7 @@ extern int git_openssl_stream_new(git_stream **out, const char *host, const char
27
27
 
28
28
 
29
29
 
30
- # if OPENSSL_VERSION_NUMBER < 0x10100000L
30
+ # if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
31
31
 
32
32
  GIT_INLINE(BIO_METHOD*) BIO_meth_new(int type, const char *name)
33
33
  {
data/vendor/libgit2/src/rebase.c CHANGED
@@ -731,7 +731,7 @@ int git_rebase_init(
731
731
  if (inmemory)
732
732
  error = rebase_init_inmemory(rebase, repo, branch, upstream, onto);
733
733
  else
734
- rebase_init_merge(rebase, repo, branch ,upstream, onto);
734
+ error = rebase_init_merge(rebase, repo, branch ,upstream, onto);
735
735
 
736
736
  if (error == 0)
737
737
  *out = rebase;
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rugged
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.25.1
4
+ version: 0.25.1.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Scott Chacon
@@ -9,48 +9,48 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2017-01-09 00:00:00.000000000 Z
12
+ date: 2017-01-23 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rake-compiler
16
16
  requirement: !ruby/object:Gem::Requirement
17
17
  requirements:
18
- - - '>='
18
+ - - ">="
19
19
  - !ruby/object:Gem::Version
20
20
  version: 0.9.0
21
21
  type: :development
22
22
  prerelease: false
23
23
  version_requirements: !ruby/object:Gem::Requirement
24
24
  requirements:
25
- - - '>='
25
+ - - ">="
26
26
  - !ruby/object:Gem::Version
27
27
  version: 0.9.0
28
28
  - !ruby/object:Gem::Dependency
29
29
  name: pry
30
30
  requirement: !ruby/object:Gem::Requirement
31
31
  requirements:
32
- - - '>='
32
+ - - ">="
33
33
  - !ruby/object:Gem::Version
34
34
  version: '0'
35
35
  type: :development
36
36
  prerelease: false
37
37
  version_requirements: !ruby/object:Gem::Requirement
38
38
  requirements:
39
- - - '>='
39
+ - - ">="
40
40
  - !ruby/object:Gem::Version
41
41
  version: '0'
42
42
  - !ruby/object:Gem::Dependency
43
43
  name: minitest
44
44
  requirement: !ruby/object:Gem::Requirement
45
45
  requirements:
46
- - - ~>
46
+ - - "~>"
47
47
  - !ruby/object:Gem::Version
48
48
  version: '5.0'
49
49
  type: :development
50
50
  prerelease: false
51
51
  version_requirements: !ruby/object:Gem::Requirement
52
52
  requirements:
53
- - - ~>
53
+ - - "~>"
54
54
  - !ruby/object:Gem::Version
55
55
  version: '5.0'
56
56
  description: |
@@ -62,30 +62,9 @@ extensions:
62
62
  - ext/rugged/extconf.rb
63
63
  extra_rdoc_files: []
64
64
  files:
65
- - README.md
66
65
  - LICENSE
67
- - lib/rugged/attributes.rb
68
- - lib/rugged/blob.rb
69
- - lib/rugged/branch.rb
70
- - lib/rugged/commit.rb
71
- - lib/rugged/console.rb
72
- - lib/rugged/credentials.rb
73
- - lib/rugged/diff/delta.rb
74
- - lib/rugged/diff/hunk.rb
75
- - lib/rugged/diff/line.rb
76
- - lib/rugged/diff.rb
77
- - lib/rugged/index.rb
78
- - lib/rugged/object.rb
79
- - lib/rugged/patch.rb
80
- - lib/rugged/reference.rb
81
- - lib/rugged/remote.rb
82
- - lib/rugged/repository.rb
83
- - lib/rugged/submodule_collection.rb
84
- - lib/rugged/tag.rb
85
- - lib/rugged/tree.rb
86
- - lib/rugged/version.rb
87
- - lib/rugged/walker.rb
88
- - lib/rugged.rb
66
+ - README.md
67
+ - ext/rugged/extconf.rb
89
68
  - ext/rugged/rugged.c
90
69
  - ext/rugged/rugged.h
91
70
  - ext/rugged/rugged_backend.c
@@ -118,12 +97,71 @@ files:
118
97
  - ext/rugged/rugged_tag.c
119
98
  - ext/rugged/rugged_tag_collection.c
120
99
  - ext/rugged/rugged_tree.c
100
+ - lib/rugged.rb
101
+ - lib/rugged/attributes.rb
102
+ - lib/rugged/blob.rb
103
+ - lib/rugged/branch.rb
104
+ - lib/rugged/commit.rb
105
+ - lib/rugged/console.rb
106
+ - lib/rugged/credentials.rb
107
+ - lib/rugged/diff.rb
108
+ - lib/rugged/diff/delta.rb
109
+ - lib/rugged/diff/hunk.rb
110
+ - lib/rugged/diff/line.rb
111
+ - lib/rugged/index.rb
112
+ - lib/rugged/object.rb
113
+ - lib/rugged/patch.rb
114
+ - lib/rugged/reference.rb
115
+ - lib/rugged/remote.rb
116
+ - lib/rugged/repository.rb
117
+ - lib/rugged/submodule_collection.rb
118
+ - lib/rugged/tag.rb
119
+ - lib/rugged/tree.rb
120
+ - lib/rugged/version.rb
121
+ - lib/rugged/walker.rb
122
+ - vendor/libgit2/AUTHORS
123
+ - vendor/libgit2/CMakeLists.txt
124
+ - vendor/libgit2/COPYING
121
125
  - vendor/libgit2/cmake/Modules/AddCFlagIfSupported.cmake
122
126
  - vendor/libgit2/cmake/Modules/FindCoreFoundation.cmake
123
127
  - vendor/libgit2/cmake/Modules/FindGSSAPI.cmake
124
128
  - vendor/libgit2/cmake/Modules/FindHTTP_Parser.cmake
125
129
  - vendor/libgit2/cmake/Modules/FindIconv.cmake
126
130
  - vendor/libgit2/cmake/Modules/FindSecurity.cmake
131
+ - vendor/libgit2/deps/http-parser/LICENSE-MIT
132
+ - vendor/libgit2/deps/http-parser/http_parser.c
133
+ - vendor/libgit2/deps/http-parser/http_parser.h
134
+ - vendor/libgit2/deps/regex/config.h
135
+ - vendor/libgit2/deps/regex/regcomp.c
136
+ - vendor/libgit2/deps/regex/regex.c
137
+ - vendor/libgit2/deps/regex/regex.h
138
+ - vendor/libgit2/deps/regex/regex_internal.c
139
+ - vendor/libgit2/deps/regex/regex_internal.h
140
+ - vendor/libgit2/deps/regex/regexec.c
141
+ - vendor/libgit2/deps/winhttp/urlmon.h
142
+ - vendor/libgit2/deps/winhttp/winhttp.def
143
+ - vendor/libgit2/deps/winhttp/winhttp.h
144
+ - vendor/libgit2/deps/winhttp/winhttp64.def
145
+ - vendor/libgit2/deps/zlib/adler32.c
146
+ - vendor/libgit2/deps/zlib/crc32.c
147
+ - vendor/libgit2/deps/zlib/crc32.h
148
+ - vendor/libgit2/deps/zlib/deflate.c
149
+ - vendor/libgit2/deps/zlib/deflate.h
150
+ - vendor/libgit2/deps/zlib/infback.c
151
+ - vendor/libgit2/deps/zlib/inffast.c
152
+ - vendor/libgit2/deps/zlib/inffast.h
153
+ - vendor/libgit2/deps/zlib/inffixed.h
154
+ - vendor/libgit2/deps/zlib/inflate.c
155
+ - vendor/libgit2/deps/zlib/inflate.h
156
+ - vendor/libgit2/deps/zlib/inftrees.c
157
+ - vendor/libgit2/deps/zlib/inftrees.h
158
+ - vendor/libgit2/deps/zlib/trees.c
159
+ - vendor/libgit2/deps/zlib/trees.h
160
+ - vendor/libgit2/deps/zlib/zconf.h
161
+ - vendor/libgit2/deps/zlib/zlib.h
162
+ - vendor/libgit2/deps/zlib/zutil.c
163
+ - vendor/libgit2/deps/zlib/zutil.h
164
+ - vendor/libgit2/include/git2.h
127
165
  - vendor/libgit2/include/git2/annotated_commit.h
128
166
  - vendor/libgit2/include/git2/attr.h
129
167
  - vendor/libgit2/include/git2/blame.h
@@ -202,7 +240,7 @@ files:
202
240
  - vendor/libgit2/include/git2/tree.h
203
241
  - vendor/libgit2/include/git2/types.h
204
242
  - vendor/libgit2/include/git2/version.h
205
- - vendor/libgit2/include/git2.h
243
+ - vendor/libgit2/libgit2.pc.in
206
244
  - vendor/libgit2/src/annotated_commit.c
207
245
  - vendor/libgit2/src/annotated_commit.h
208
246
  - vendor/libgit2/src/apply.c
@@ -284,14 +322,14 @@ files:
284
322
  - vendor/libgit2/src/global.c
285
323
  - vendor/libgit2/src/global.h
286
324
  - vendor/libgit2/src/graph.c
325
+ - vendor/libgit2/src/hash.c
326
+ - vendor/libgit2/src/hash.h
287
327
  - vendor/libgit2/src/hash/hash_common_crypto.h
288
328
  - vendor/libgit2/src/hash/hash_generic.c
289
329
  - vendor/libgit2/src/hash/hash_generic.h
290
330
  - vendor/libgit2/src/hash/hash_openssl.h
291
331
  - vendor/libgit2/src/hash/hash_win32.c
292
332
  - vendor/libgit2/src/hash/hash_win32.h
293
- - vendor/libgit2/src/hash.c
294
- - vendor/libgit2/src/hash.h
295
333
  - vendor/libgit2/src/hashsig.c
296
334
  - vendor/libgit2/src/ident.c
297
335
  - vendor/libgit2/src/idxmap.h
@@ -493,44 +531,6 @@ files:
493
531
  - vendor/libgit2/src/xdiff/xutils.h
494
532
  - vendor/libgit2/src/zstream.c
495
533
  - vendor/libgit2/src/zstream.h
496
- - vendor/libgit2/deps/http-parser/http_parser.c
497
- - vendor/libgit2/deps/http-parser/http_parser.h
498
- - vendor/libgit2/deps/http-parser/LICENSE-MIT
499
- - vendor/libgit2/deps/regex/config.h
500
- - vendor/libgit2/deps/regex/regcomp.c
501
- - vendor/libgit2/deps/regex/regex.c
502
- - vendor/libgit2/deps/regex/regex.h
503
- - vendor/libgit2/deps/regex/regex_internal.c
504
- - vendor/libgit2/deps/regex/regex_internal.h
505
- - vendor/libgit2/deps/regex/regexec.c
506
- - vendor/libgit2/deps/winhttp/urlmon.h
507
- - vendor/libgit2/deps/winhttp/winhttp.def
508
- - vendor/libgit2/deps/winhttp/winhttp.h
509
- - vendor/libgit2/deps/winhttp/winhttp64.def
510
- - vendor/libgit2/deps/zlib/adler32.c
511
- - vendor/libgit2/deps/zlib/crc32.c
512
- - vendor/libgit2/deps/zlib/crc32.h
513
- - vendor/libgit2/deps/zlib/deflate.c
514
- - vendor/libgit2/deps/zlib/deflate.h
515
- - vendor/libgit2/deps/zlib/infback.c
516
- - vendor/libgit2/deps/zlib/inffast.c
517
- - vendor/libgit2/deps/zlib/inffast.h
518
- - vendor/libgit2/deps/zlib/inffixed.h
519
- - vendor/libgit2/deps/zlib/inflate.c
520
- - vendor/libgit2/deps/zlib/inflate.h
521
- - vendor/libgit2/deps/zlib/inftrees.c
522
- - vendor/libgit2/deps/zlib/inftrees.h
523
- - vendor/libgit2/deps/zlib/trees.c
524
- - vendor/libgit2/deps/zlib/trees.h
525
- - vendor/libgit2/deps/zlib/zconf.h
526
- - vendor/libgit2/deps/zlib/zlib.h
527
- - vendor/libgit2/deps/zlib/zutil.c
528
- - vendor/libgit2/deps/zlib/zutil.h
529
- - vendor/libgit2/CMakeLists.txt
530
- - vendor/libgit2/AUTHORS
531
- - vendor/libgit2/COPYING
532
- - vendor/libgit2/libgit2.pc.in
533
- - ext/rugged/extconf.rb
534
534
  homepage: https://github.com/libgit2/rugged
535
535
  licenses:
536
536
  - MIT
@@ -541,17 +541,17 @@ require_paths:
541
541
  - lib
542
542
  required_ruby_version: !ruby/object:Gem::Requirement
543
543
  requirements:
544
- - - '>='
544
+ - - ">="
545
545
  - !ruby/object:Gem::Version
546
546
  version: 1.9.3
547
547
  required_rubygems_version: !ruby/object:Gem::Requirement
548
548
  requirements:
549
- - - '>='
549
+ - - ">="
550
550
  - !ruby/object:Gem::Version
551
551
  version: '0'
552
552
  requirements: []
553
553
  rubyforge_project:
554
- rubygems_version: 2.0.14.1
554
+ rubygems_version: 2.6.8
555
555
  signing_key:
556
556
  specification_version: 4
557
557
  summary: Rugged is a Ruby binding to the libgit2 linkable library