rugged 0.25.0b3 → 0.25.0b4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: decef5bc39de7103a2e879463898551989f0356f
-  data.tar.gz: 0011b10ea74d9092eaa562c635a1fbfc9aa8603d
+  metadata.gz: 9ea4cb60e3267817cda5b2578e0527e5d9310e53
+  data.tar.gz: 9831198a4fc9084f713416f1cad54b4e795f6a89
 SHA512:
-  metadata.gz: a72e1a7f4f0053397c15a3f995ed11b4fa3255202ff738a148652f4813ce619d62481423084b471659905a023d3c2ed42d83d182c86f0a66cfdb50ab18fe2aef
-  data.tar.gz: b45c43553374f7eb2ea44728f9fb9e15e2eb8bee4f70261c6336f38d9d8345d7b87b567289e040663426a2a3a0216a46197130ef0b3e386fe0d19cdb40388ba2
+  metadata.gz: aeff15bd39959a72b1e0a300d2ee6e87f8e657dfef76aea51815cae86020140f9401f604187cd581894be00e09c35d17bda907c7ad4051dcff2700c8164389a1
+  data.tar.gz: 7cfb2950f9ebf716375fb8f522fc6b22c443f869adb689dcf8662ffe000522612c21b6b9a8ec5e502b44c51e57f17b6523d82a986084ac4e280ce8a0a80a0c47

data/lib/rugged/version.rb

@@ -1,3 +1,3 @@
 module Rugged
-  Version = VERSION = '0.25.0b3'
+  Version = VERSION = '0.25.0b4'
 end

data/vendor/libgit2/CMakeLists.txt

@@ -40,7 +40,7 @@ OPTION( USE_ICONV			"Link with and use iconv library" 		OFF )
 OPTION( USE_SSH				"Link with libssh to enable SSH support" ON )
 OPTION( USE_GSSAPI			"Link with libgssapi for SPNEGO auth"   OFF )
 OPTION( VALGRIND			"Configure build for valgrind"			OFF )
-OPTION( CURL			"User curl for HTTP if available" ON)
+OPTION( CURL			"Use curl for HTTP if available" ON)
 OPTION( DEBUG_POOL			"Enable debug pool allocator"			OFF )
 
 IF(DEBUG_POOL)
@@ -151,6 +151,10 @@ FUNCTION(TARGET_OS_LIBRARIES target)
 		TARGET_LINK_LIBRARIES(${target} socket nsl)
 		LIST(APPEND LIBGIT2_PC_LIBS "-lsocket" "-lnsl")
 		SET(LIBGIT2_PC_LIBS ${LIBGIT2_PC_LIBS} PARENT_SCOPE)
+	ELSEIF(CMAKE_SYSTEM_NAME MATCHES "Haiku")
+		TARGET_LINK_LIBRARIES(${target} network)
+		LIST(APPEND LIBGIT2_PC_LIBS "-lnetwork")
+		SET(LIBGIT2_PC_LIBS ${LIBGIT2_PC_LIBS} PARENT_SCOPE)
 	ENDIF()
 	CHECK_LIBRARY_EXISTS(rt clock_gettime "time.h" NEED_LIBRT)
 	IF(NEED_LIBRT)

data/vendor/libgit2/src/checkout.c

@@ -482,7 +482,8 @@ static int checkout_action_with_wd(
 			*action = CHECKOUT_ACTION_IF(SAFE, REMOVE, NONE);
 		break;
 	case GIT_DELTA_MODIFIED: /* case 16, 17, 18 (or 36 but not really) */
-		if (checkout_is_workdir_modified(data, &delta->old_file, &delta->new_file, wd))
+		if (wd->mode != GIT_FILEMODE_COMMIT &&
+			checkout_is_workdir_modified(data, &delta->old_file, &delta->new_file, wd))
 			*action = CHECKOUT_ACTION_IF(FORCE, UPDATE_BLOB, CONFLICT);
 		else
 			*action = CHECKOUT_ACTION_IF(SAFE, UPDATE_BLOB, NONE);

data/vendor/libgit2/src/commit.c

@@ -40,7 +40,6 @@ void git_commit__free(void *_commit)
 
 static int git_commit__create_buffer_internal(
 	git_buf *out,
-	git_repository *repo,
 	const git_signature *author,
 	const git_signature *committer,
 	const char *message_encoding,
@@ -51,7 +50,7 @@ static int git_commit__create_buffer_internal(
 	size_t i = 0;
 	const git_oid *parent;
 
-	assert(out && repo && tree);
+	assert(out && tree);
 
 	git_oid__writebuf(out, "tree ", tree);
 
@@ -150,7 +149,7 @@ static int git_commit__create_internal(
 	if ((error = validate_tree_and_parents(&parents, repo, tree, parent_cb, parent_payload, current_id, validate)) < 0)
 		goto cleanup;
 
-	error = git_commit__create_buffer_internal(&buf, repo, author, committer,
+	error = git_commit__create_buffer_internal(&buf, author, committer,
 						   message_encoding, message, tree,
 						   &parents);
 
@@ -813,7 +812,7 @@ int git_commit_create_buffer(git_buf *out,
 		return error;
 
 	error = git_commit__create_buffer_internal(
-		out, repo, author, committer,
+		out, author, committer,
 		message_encoding, message, tree_id,
 		&parents_arr);
 

data/vendor/libgit2/src/filebuf.c

@@ -70,7 +70,7 @@ static int lock_file(git_filebuf *file, int flags, mode_t mode)
 		git_file source;
 		char buffer[FILEIO_BUFSIZE];
 		ssize_t read_bytes;
-		int error;
+		int error = 0;
 
 		source = p_open(file->path_original, O_RDONLY);
 		if (source < 0) {

data/vendor/libgit2/src/global.c

@@ -228,6 +228,9 @@ void git__free_tls_data(void)
 
 BOOL WINAPI DllMain(HINSTANCE hInstDll, DWORD fdwReason, LPVOID lpvReserved)
 {
+	GIT_UNUSED(hInstDll);
+	GIT_UNUSED(lpvReserved);
+
 	/* This is how Windows lets us know our thread is being shut down */
 	if (fdwReason == DLL_THREAD_DETACH) {
 		git__free_tls_data();

data/vendor/libgit2/src/index.c

@@ -2968,6 +2968,8 @@ int git_index_read_index(
 			*remove_entry = NULL;
 		int diff;
 
+		error = 0;
+
 		if (old_entry && new_entry)
 			diff = git_index_entry_cmp(old_entry, new_entry);
 		else if (!old_entry && new_entry)
@@ -2985,7 +2987,8 @@ int git_index_read_index(
 			/* Path and stage are equal, if the OID is equal, keep it to
 			 * keep the stat cache data.
 			 */
-			if (git_oid_equal(&old_entry->id, &new_entry->id)) {
+			if (git_oid_equal(&old_entry->id, &new_entry->id) &&
+				old_entry->mode == new_entry->mode) {
 				add_entry = (git_index_entry *)old_entry;
 			} else {
 				dup_entry = (git_index_entry *)new_entry;
@@ -2996,8 +2999,17 @@ int git_index_read_index(
 		if (dup_entry) {
 			if ((error = index_entry_dup_nocache(&add_entry, index, dup_entry)) < 0)
 				goto done;
+
+			index_entry_adjust_namemask(add_entry,
+				((struct entry_internal *)add_entry)->pathlen);
 		}
 
+		/* invalidate this path in the tree cache if this is new (to
+		 * invalidate the parent trees)
+		 */
+		if (dup_entry && !remove_entry && index->tree)
+			git_tree_cache_invalidate_path(index->tree, dup_entry->path);
+
 		if (add_entry) {
 			if ((error = git_vector_insert(&new_entries, add_entry)) == 0)
 				INSERT_IN_MAP_EX(index, new_entries_map, add_entry, error);

data/vendor/libgit2/src/merge.c

@@ -2827,6 +2827,7 @@ static int merge_check_workdir(size_t *conflicts, git_repository *repo, git_inde
 	opts.flags |= GIT_DIFF_DISABLE_PATHSPEC_MATCH;
 	opts.pathspec.count = merged_paths->length;
 	opts.pathspec.strings = (char **)merged_paths->contents;
+	opts.ignore_submodules = GIT_SUBMODULE_IGNORE_ALL;
 
 	if ((error = git_diff_index_to_workdir(&wd_diff_list, repo, NULL, &opts)) < 0)
 		goto done;

data/vendor/libgit2/src/rebase.c

@@ -1047,15 +1047,12 @@ static int rebase_commit_inmemory(
 	const char *message_encoding,
 	const char *message)
 {
-	git_rebase_operation *operation;
 	git_commit *commit = NULL;
 	int error = 0;
 
-	operation = git_array_get(rebase->operations, rebase->current);
-
-	assert(operation);
 	assert(rebase->index);
 	assert(rebase->last_commit);
+	assert(rebase->current < rebase->operations.size);
 
 	if ((error = rebase_commit__create(&commit, rebase, rebase->index,
 		rebase->last_commit, author, committer, message_encoding, message)) < 0)

data/vendor/libgit2/src/tree.c

@@ -45,7 +45,7 @@ GIT_INLINE(git_filemode_t) normalize_filemode(git_filemode_t filemode)
 	if (GIT_MODE_TYPE(filemode) == GIT_FILEMODE_COMMIT)
 		return GIT_FILEMODE_COMMIT;
 
-	/* 12XXXX means commit */
+	/* 12XXXX means symlink */
 	if (GIT_MODE_TYPE(filemode) == GIT_FILEMODE_LINK)
 		return GIT_FILEMODE_LINK;
 
@@ -1093,6 +1093,15 @@ static int create_popped_tree(tree_stack_entry *current, tree_stack_entry *poppe
 	git_oid new_tree;
 
 	git_tree_free(popped->tree);
+
+	/* If the tree would be empty, remove it from the one higher up */
+	if (git_treebuilder_entrycount(popped->bld) == 0) {
+		git_treebuilder_free(popped->bld);
+		error = git_treebuilder_remove(current->bld, popped->name);
+		git__free(popped->name);
+		return error;
+	}
+
 	error = git_treebuilder_write(&new_tree, popped->bld);
 	git_treebuilder_free(popped->bld);
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rugged
 version: !ruby/object:Gem::Version
-  version: 0.25.0b3
+  version: 0.25.0b4
 platform: ruby
 authors:
 - Scott Chacon
@@ -9,48 +9,48 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-24 00:00:00.000000000 Z
+date: 2016-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
 description: |
@@ -62,9 +62,30 @@ extensions:
 - ext/rugged/extconf.rb
 extra_rdoc_files: []
 files:
-- LICENSE
 - README.md
-- ext/rugged/extconf.rb
+- LICENSE
+- lib/rugged/attributes.rb
+- lib/rugged/blob.rb
+- lib/rugged/branch.rb
+- lib/rugged/commit.rb
+- lib/rugged/console.rb
+- lib/rugged/credentials.rb
+- lib/rugged/diff/delta.rb
+- lib/rugged/diff/hunk.rb
+- lib/rugged/diff/line.rb
+- lib/rugged/diff.rb
+- lib/rugged/index.rb
+- lib/rugged/object.rb
+- lib/rugged/patch.rb
+- lib/rugged/reference.rb
+- lib/rugged/remote.rb
+- lib/rugged/repository.rb
+- lib/rugged/submodule_collection.rb
+- lib/rugged/tag.rb
+- lib/rugged/tree.rb
+- lib/rugged/version.rb
+- lib/rugged/walker.rb
+- lib/rugged.rb
 - ext/rugged/rugged.c
 - ext/rugged/rugged.h
 - ext/rugged/rugged_backend.c
@@ -97,71 +118,12 @@ files:
 - ext/rugged/rugged_tag.c
 - ext/rugged/rugged_tag_collection.c
 - ext/rugged/rugged_tree.c
-- lib/rugged.rb
-- lib/rugged/attributes.rb
-- lib/rugged/blob.rb
-- lib/rugged/branch.rb
-- lib/rugged/commit.rb
-- lib/rugged/console.rb
-- lib/rugged/credentials.rb
-- lib/rugged/diff.rb
-- lib/rugged/diff/delta.rb
-- lib/rugged/diff/hunk.rb
-- lib/rugged/diff/line.rb
-- lib/rugged/index.rb
-- lib/rugged/object.rb
-- lib/rugged/patch.rb
-- lib/rugged/reference.rb
-- lib/rugged/remote.rb
-- lib/rugged/repository.rb
-- lib/rugged/submodule_collection.rb
-- lib/rugged/tag.rb
-- lib/rugged/tree.rb
-- lib/rugged/version.rb
-- lib/rugged/walker.rb
-- vendor/libgit2/AUTHORS
-- vendor/libgit2/CMakeLists.txt
-- vendor/libgit2/COPYING
 - vendor/libgit2/cmake/Modules/AddCFlagIfSupported.cmake
 - vendor/libgit2/cmake/Modules/FindCoreFoundation.cmake
 - vendor/libgit2/cmake/Modules/FindGSSAPI.cmake
 - vendor/libgit2/cmake/Modules/FindHTTP_Parser.cmake
 - vendor/libgit2/cmake/Modules/FindIconv.cmake
 - vendor/libgit2/cmake/Modules/FindSecurity.cmake
-- vendor/libgit2/deps/http-parser/LICENSE-MIT
-- vendor/libgit2/deps/http-parser/http_parser.c
-- vendor/libgit2/deps/http-parser/http_parser.h
-- vendor/libgit2/deps/regex/config.h
-- vendor/libgit2/deps/regex/regcomp.c
-- vendor/libgit2/deps/regex/regex.c
-- vendor/libgit2/deps/regex/regex.h
-- vendor/libgit2/deps/regex/regex_internal.c
-- vendor/libgit2/deps/regex/regex_internal.h
-- vendor/libgit2/deps/regex/regexec.c
-- vendor/libgit2/deps/winhttp/urlmon.h
-- vendor/libgit2/deps/winhttp/winhttp.def
-- vendor/libgit2/deps/winhttp/winhttp.h
-- vendor/libgit2/deps/winhttp/winhttp64.def
-- vendor/libgit2/deps/zlib/adler32.c
-- vendor/libgit2/deps/zlib/crc32.c
-- vendor/libgit2/deps/zlib/crc32.h
-- vendor/libgit2/deps/zlib/deflate.c
-- vendor/libgit2/deps/zlib/deflate.h
-- vendor/libgit2/deps/zlib/infback.c
-- vendor/libgit2/deps/zlib/inffast.c
-- vendor/libgit2/deps/zlib/inffast.h
-- vendor/libgit2/deps/zlib/inffixed.h
-- vendor/libgit2/deps/zlib/inflate.c
-- vendor/libgit2/deps/zlib/inflate.h
-- vendor/libgit2/deps/zlib/inftrees.c
-- vendor/libgit2/deps/zlib/inftrees.h
-- vendor/libgit2/deps/zlib/trees.c
-- vendor/libgit2/deps/zlib/trees.h
-- vendor/libgit2/deps/zlib/zconf.h
-- vendor/libgit2/deps/zlib/zlib.h
-- vendor/libgit2/deps/zlib/zutil.c
-- vendor/libgit2/deps/zlib/zutil.h
-- vendor/libgit2/include/git2.h
 - vendor/libgit2/include/git2/annotated_commit.h
 - vendor/libgit2/include/git2/attr.h
 - vendor/libgit2/include/git2/blame.h
@@ -239,7 +201,7 @@ files:
 - vendor/libgit2/include/git2/tree.h
 - vendor/libgit2/include/git2/types.h
 - vendor/libgit2/include/git2/version.h
-- vendor/libgit2/libgit2.pc.in
+- vendor/libgit2/include/git2.h
 - vendor/libgit2/src/annotated_commit.c
 - vendor/libgit2/src/annotated_commit.h
 - vendor/libgit2/src/array.h
@@ -318,14 +280,14 @@ files:
 - vendor/libgit2/src/global.c
 - vendor/libgit2/src/global.h
 - vendor/libgit2/src/graph.c
-- vendor/libgit2/src/hash.c
-- vendor/libgit2/src/hash.h
 - vendor/libgit2/src/hash/hash_common_crypto.h
 - vendor/libgit2/src/hash/hash_generic.c
 - vendor/libgit2/src/hash/hash_generic.h
 - vendor/libgit2/src/hash/hash_openssl.h
 - vendor/libgit2/src/hash/hash_win32.c
 - vendor/libgit2/src/hash/hash_win32.h
+- vendor/libgit2/src/hash.c
+- vendor/libgit2/src/hash.h
 - vendor/libgit2/src/hashsig.c
 - vendor/libgit2/src/ident.c
 - vendor/libgit2/src/idxmap.h
@@ -518,6 +480,44 @@ files:
 - vendor/libgit2/src/xdiff/xutils.h
 - vendor/libgit2/src/zstream.c
 - vendor/libgit2/src/zstream.h
+- vendor/libgit2/deps/http-parser/http_parser.c
+- vendor/libgit2/deps/http-parser/http_parser.h
+- vendor/libgit2/deps/http-parser/LICENSE-MIT
+- vendor/libgit2/deps/regex/config.h
+- vendor/libgit2/deps/regex/regcomp.c
+- vendor/libgit2/deps/regex/regex.c
+- vendor/libgit2/deps/regex/regex.h
+- vendor/libgit2/deps/regex/regex_internal.c
+- vendor/libgit2/deps/regex/regex_internal.h
+- vendor/libgit2/deps/regex/regexec.c
+- vendor/libgit2/deps/winhttp/urlmon.h
+- vendor/libgit2/deps/winhttp/winhttp.def
+- vendor/libgit2/deps/winhttp/winhttp.h
+- vendor/libgit2/deps/winhttp/winhttp64.def
+- vendor/libgit2/deps/zlib/adler32.c
+- vendor/libgit2/deps/zlib/crc32.c
+- vendor/libgit2/deps/zlib/crc32.h
+- vendor/libgit2/deps/zlib/deflate.c
+- vendor/libgit2/deps/zlib/deflate.h
+- vendor/libgit2/deps/zlib/infback.c
+- vendor/libgit2/deps/zlib/inffast.c
+- vendor/libgit2/deps/zlib/inffast.h
+- vendor/libgit2/deps/zlib/inffixed.h
+- vendor/libgit2/deps/zlib/inflate.c
+- vendor/libgit2/deps/zlib/inflate.h
+- vendor/libgit2/deps/zlib/inftrees.c
+- vendor/libgit2/deps/zlib/inftrees.h
+- vendor/libgit2/deps/zlib/trees.c
+- vendor/libgit2/deps/zlib/trees.h
+- vendor/libgit2/deps/zlib/zconf.h
+- vendor/libgit2/deps/zlib/zlib.h
+- vendor/libgit2/deps/zlib/zutil.c
+- vendor/libgit2/deps/zlib/zutil.h
+- vendor/libgit2/CMakeLists.txt
+- vendor/libgit2/AUTHORS
+- vendor/libgit2/COPYING
+- vendor/libgit2/libgit2.pc.in
+- ext/rugged/extconf.rb
 homepage: https://github.com/libgit2/rugged
 licenses:
 - MIT
@@ -528,17 +528,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - '>'
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: Rugged is a Ruby binding to the libgit2 linkable library