rugged 0.27.7 → 0.27.9

data/vendor/libgit2/src/index.h

@@ -20,8 +20,6 @@
 #define GIT_INDEX_FILE "index"
 #define GIT_INDEX_FILE_MODE 0666
 
-extern bool git_index__enforce_unsaved_safety;
-
 struct git_index {
 	git_refcount rc;
 
@@ -39,7 +37,6 @@ struct git_index {
 	unsigned int ignore_case:1;
 	unsigned int distrust_filemode:1;
 	unsigned int no_symlinks:1;
-	unsigned int dirty:1;	/* whether we have unsaved changes */
 
 	git_tree_cache *tree;
 	git_pool tree_pool;
@@ -146,13 +143,6 @@ extern int git_index_snapshot_find(
 /* Replace an index with a new index */
 int git_index_read_index(git_index *index, const git_index *new_index);
 
-GIT_INLINE(int) git_index_is_dirty(git_index *index)
-{
-	return index->dirty;
-}
-
-extern int git_index_read_safely(git_index *index);
-
 typedef struct {
 	git_index *index;
 	git_filebuf file;

data/vendor/libgit2/src/indexer.c

@@ -134,12 +134,12 @@ int git_indexer_new(
 		goto cleanup;
 
 	fd = git_futils_mktmp(&tmp_path, git_buf_cstr(&path), idx->mode);
-	git_buf_dispose(&path);
+	git_buf_free(&path);
 	if (fd < 0)
 		goto cleanup;
 
 	error = git_packfile_alloc(&idx->pack, git_buf_cstr(&tmp_path));
-	git_buf_dispose(&tmp_path);
+	git_buf_free(&tmp_path);
 
 	if (error < 0)
 		goto cleanup;
@@ -161,8 +161,8 @@ cleanup:
 	if (idx->pack != NULL)
 		p_unlink(idx->pack->pack_name);
 
-	git_buf_dispose(&path);
-	git_buf_dispose(&tmp_path);
+	git_buf_free(&path);
+	git_buf_free(&tmp_path);
 	git__free(idx);
 	return -1;
 }
@@ -650,7 +650,7 @@ int git_indexer_append(git_indexer *idx, const void *data, size_t size, git_tran
 
 		/* We want to free the stream reasorces no matter what here */
 		idx->have_stream = 0;
-		git_packfile_stream_dispose(stream);
+		git_packfile_stream_free(stream);
 
 		if (error < 0)
 			goto on_error;
@@ -758,7 +758,7 @@ static int inject_object(git_indexer *idx, git_oid *id)
 
 	idx->pack->mwf.size += buf.size;
 	entry->crc = htonl(crc32(entry->crc, (unsigned char *)buf.ptr, (uInt)buf.size));
-	git_buf_dispose(&buf);
+	git_buf_free(&buf);
 
 	/* Write a fake trailer so the pack functions play ball */
 
@@ -1121,13 +1121,13 @@ int git_indexer_commit(git_indexer *idx, git_transfer_progress *stats)
 
 	idx->pack_committed = 1;
 
-	git_buf_dispose(&filename);
+	git_buf_free(&filename);
 	return 0;
 
 on_error:
 	git_mwindow_free_all(&idx->pack->mwf);
 	git_filebuf_cleanup(&index_file);
-	git_buf_dispose(&filename);
+	git_buf_free(&filename);
 	return -1;
 }
 
@@ -1137,7 +1137,7 @@ void git_indexer_free(git_indexer *idx)
 		return;
 
 	if (idx->have_stream)
-		git_packfile_stream_dispose(&idx->stream);
+		git_packfile_stream_free(&idx->stream);
 
 	git_vector_free_deep(&idx->objects);
 

data/vendor/libgit2/src/iterator.c

@@ -701,7 +701,7 @@ static void tree_iterator_frame_pop(tree_iterator *iter)
 
 	do {
 		buf = git_array_pop(frame->similar_paths);
-		git_buf_dispose(buf);
+		git_buf_free(buf);
 	} while (buf != NULL);
 
 	git_array_clear(frame->similar_paths);
@@ -711,7 +711,7 @@ static void tree_iterator_frame_pop(tree_iterator *iter)
 
 	git_vector_free(&frame->similar_trees);
 
-	git_buf_dispose(&frame->path);
+	git_buf_free(&frame->path);
 }
 
 static int tree_iterator_current(
@@ -929,7 +929,7 @@ static void tree_iterator_free(git_iterator *i)
 	tree_iterator_clear(iter);
 
 	git_tree_free(iter->root);
-	git_buf_dispose(&iter->entry_path);
+	git_buf_free(&iter->entry_path);
 }
 
 int git_iterator_for_tree(
@@ -1435,7 +1435,7 @@ done:
 	if (error < 0)
 		git_array_pop(iter->frames);
 
-	git_buf_dispose(&root);
+	git_buf_free(&root);
 	git_path_diriter_free(&diriter);
 	return error;
 }
@@ -1523,7 +1523,7 @@ static int filesystem_iterator_is_dir(
 	*is_dir = S_ISDIR(st.st_mode);
 
 done:
-	git_buf_dispose(&fullpath);
+	git_buf_free(&fullpath);
 	return error;
 }
 
@@ -1804,7 +1804,7 @@ static void filesystem_iterator_clear(filesystem_iterator *iter)
 	git_array_clear(iter->frames);
 	git_ignore__free(&iter->ignores);
 
-	git_buf_dispose(&iter->tmp_buf);
+	git_buf_free(&iter->tmp_buf);
 
 	iterator_clear(&iter->base);
 }
@@ -1838,7 +1838,7 @@ static void filesystem_iterator_free(git_iterator *i)
 {
 	filesystem_iterator *iter = (filesystem_iterator *)i;
 	git__free(iter->root);
-	git_buf_dispose(&iter->current_path);
+	git_buf_free(&iter->current_path);
 	git_tree_free(iter->tree);
 	if (iter->index)
 		git_index_snapshot_release(&iter->index_snapshot, iter->index);
@@ -2176,7 +2176,7 @@ static void index_iterator_free(git_iterator *i)
 	index_iterator *iter = (index_iterator *)i;
 
 	git_index_snapshot_release(&iter->entries, iter->base.index);
-	git_buf_dispose(&iter->tree_buf);
+	git_buf_free(&iter->tree_buf);
 }
 
 int git_iterator_for_index(

data/vendor/libgit2/src/khash.h

@@ -146,10 +146,8 @@ typedef unsigned long long khint64_t;
 #ifndef kh_inline
 #ifdef _MSC_VER
 #define kh_inline __inline
-#elif defined(__GNUC__)
-#define kh_inline __inline__
 #else
-#define kh_inline
+#define kh_inline inline
 #endif
 #endif /* kh_inline */
 

data/vendor/libgit2/src/merge.c

@@ -599,8 +599,8 @@ int git_repository_mergehead_foreach(
 	}
 
 cleanup:
-	git_buf_dispose(&merge_head_path);
-	git_buf_dispose(&merge_head_file);
+	git_buf_free(&merge_head_path);
+	git_buf_free(&merge_head_file);
 
 	return error;
 }
@@ -875,7 +875,7 @@ static int merge_conflict_invoke_driver(
 	*out = result;
 
 done:
-	git_buf_dispose(&buf);
+	git_buf_free(&buf);
 	git_odb_free(odb);
 
 	return error;
@@ -2444,7 +2444,7 @@ cleanup:
 	if (error < 0)
 		git_filebuf_cleanup(&file);
 
-	git_buf_dispose(&file_path);
+	git_buf_free(&file_path);
 
 	return error;
 }
@@ -2470,7 +2470,7 @@ cleanup:
 	if (error < 0)
 		git_filebuf_cleanup(&file);
 
-	git_buf_dispose(&file_path);
+	git_buf_free(&file_path);
 
 	return error;
 }
@@ -2770,7 +2770,7 @@ cleanup:
 	if (error < 0)
 		git_filebuf_cleanup(&file);
 
-	git_buf_dispose(&file_path);
+	git_buf_free(&file_path);
 
 	git_vector_free(&matching);
 	git__free(entries);
@@ -3090,7 +3090,7 @@ cleanup:
 	if (error < 0)
 		git_filebuf_cleanup(&file);
 
-	git_buf_dispose(&file_path);
+	git_buf_free(&file_path);
 
 	return error;
 }

data/vendor/libgit2/src/netops.c

@@ -292,10 +292,10 @@ int gitno_extract_url_parts(
 	*password_out = git_buf_detach(&password);
 
 done:
-	git_buf_dispose(&host);
-	git_buf_dispose(&port);
-	git_buf_dispose(&path);
-	git_buf_dispose(&username);
-	git_buf_dispose(&password);
+	git_buf_free(&host);
+	git_buf_free(&port);
+	git_buf_free(&path);
+	git_buf_free(&username);
+	git_buf_free(&password);
 	return error;
 }

data/vendor/libgit2/src/notes.c

@@ -285,7 +285,7 @@ static int note_write(
 	git_oid oid;
 	git_tree *tree = NULL;
 
-	/* TODO: should we apply filters? */
+	// TODO: should we apply filters?
 	/* create note object */
 	if ((error = git_blob_create_frombuffer(&oid, repo, note, strlen(note))) < 0)
 		goto cleanup;
@@ -710,7 +710,7 @@ static int process_entry_path(
 	error = git_oid_fromstr(annotated_object_id, buf.ptr);
 
 cleanup:
-	git_buf_dispose(&buf);
+	git_buf_free(&buf);
 	return error;
 }
 

data/vendor/libgit2/src/odb.c

@@ -260,12 +260,12 @@ int git_odb__hashfd_filtered(
 
 		error = git_filter_list_apply_to_data(&post, fl, &raw);
 
-		git_buf_dispose(&raw);
+		git_buf_free(&raw);
 
 		if (!error)
 			error = git_odb_hash(out, post.ptr, post.size, type);
 
-		git_buf_dispose(&post);
+		git_buf_free(&post);
 	}
 
 	return error;
@@ -588,12 +588,12 @@ static int load_alternates(git_odb *odb, const char *objects_dir, int alternate_
 		return -1;
 
 	if (git_path_exists(alternates_path.ptr) == false) {
-		git_buf_dispose(&alternates_path);
+		git_buf_free(&alternates_path);
 		return 0;
 	}
 
 	if (git_futils_readbuffer(&alternates_buf, alternates_path.ptr) < 0) {
-		git_buf_dispose(&alternates_path);
+		git_buf_free(&alternates_path);
 		return -1;
 	}
 
@@ -619,8 +619,8 @@ static int load_alternates(git_odb *odb, const char *objects_dir, int alternate_
 			break;
 	}
 
-	git_buf_dispose(&alternates_path);
-	git_buf_dispose(&alternates_buf);
+	git_buf_free(&alternates_path);
+	git_buf_free(&alternates_buf);
 
 	return result;
 }
@@ -1181,7 +1181,7 @@ static int read_prefix_1(git_odb_object **out, git_odb *db,
 					git_oid_tostr_s(&found_full_oid));
 
 				error = git_odb__error_ambiguous(buf.ptr);
-				git_buf_dispose(&buf);
+				git_buf_free(&buf);
 				goto out;
 			}
 
@@ -1384,8 +1384,8 @@ static int git_odb_stream__invalid_length(
 {
 	giterr_set(GITERR_ODB,
 		"cannot %s - "
-		"Invalid length. %"PRIdZ" was expected. The "
-		"total size of the received chunks amounts to %"PRIdZ".",
+		"Invalid length. %"PRId64" was expected. The "
+		"total size of the received chunks amounts to %"PRId64".",
 		action, stream->declared_size, stream->received_bytes);
 
 	return -1;

data/vendor/libgit2/src/odb_loose.c

@@ -266,7 +266,7 @@ static int read_loose_packlike(git_rawobj *out, git_buf *obj)
 	out->data = git_buf_detach(&body);
 
 done:
-	git_buf_dispose(&body);
+	git_buf_free(&body);
 	return error;
 }
 
@@ -362,7 +362,7 @@ static int read_loose(git_rawobj *out, git_buf *loc)
 		error = read_loose_standard(out, &obj);
 
 done:
-	git_buf_dispose(&obj);
+	git_buf_free(&obj);
 	return error;
 }
 
@@ -593,7 +593,7 @@ static int loose_backend__read_header(size_t *len_p, git_otype *type_p, git_odb_
 		*type_p = raw.type;
 	}
 
-	git_buf_dispose(&object_path);
+	git_buf_free(&object_path);
 
 	return error;
 }
@@ -615,7 +615,7 @@ static int loose_backend__read(void **buffer_p, size_t *len_p, git_otype *type_p
 		*type_p = raw.type;
 	}
 
-	git_buf_dispose(&object_path);
+	git_buf_free(&object_path);
 
 	return error;
 }
@@ -653,7 +653,7 @@ static int loose_backend__read_prefix(
 			*type_p = raw.type;
 		}
 
-		git_buf_dispose(&object_path);
+		git_buf_free(&object_path);
 	}
 
 	return error;
@@ -668,7 +668,7 @@ static int loose_backend__exists(git_odb_backend *backend, const git_oid *oid)
 
 	error = locate_object(&object_path, (loose_backend *)backend, oid);
 
-	git_buf_dispose(&object_path);
+	git_buf_free(&object_path);
 
 	return !error;
 }
@@ -684,7 +684,7 @@ static int loose_backend__exists_prefix(
 	error = locate_object_short_oid(
 		&object_path, out, (loose_backend *)backend, short_id, len);
 
-	git_buf_dispose(&object_path);
+	git_buf_free(&object_path);
 
 	return error;
 }
@@ -770,7 +770,7 @@ static int loose_backend__foreach(git_odb_backend *_backend, git_odb_foreach_cb
 
 	error = git_path_direach(&buf, 0, foreach_cb, &state);
 
-	git_buf_dispose(&buf);
+	git_buf_free(&buf);
 
 	return error;
 }
@@ -789,7 +789,7 @@ static int loose_backend__writestream_finalize(git_odb_stream *_stream, const gi
 		error = git_filebuf_commit_at(
 			&stream->fbuf, final_path.ptr);
 
-	git_buf_dispose(&final_path);
+	git_buf_free(&final_path);
 
 	return error;
 }
@@ -856,7 +856,7 @@ static int loose_backend__writestream(git_odb_stream **stream_out, git_odb_backe
 		git__free(stream);
 		stream = NULL;
 	}
-	git_buf_dispose(&tmp_path);
+	git_buf_free(&tmp_path);
 	*stream_out = (git_odb_stream *)stream;
 
 	return !stream ? -1 : 0;
@@ -1028,14 +1028,18 @@ static int loose_backend__readstream(
 
 done:
 	if (error < 0) {
-		git_futils_mmap_free(&stream->map);
-		git_zstream_free(&stream->zstream);
-		git_hash_ctx_cleanup(hash_ctx);
-		git__free(hash_ctx);
-		git__free(stream);
+		if (stream) {
+			git_futils_mmap_free(&stream->map);
+			git_zstream_free(&stream->zstream);
+			git__free(stream);
+		}
+		if (hash_ctx) {
+			git_hash_ctx_cleanup(hash_ctx);
+			git__free(hash_ctx);
+		}
 	}
 
-	git_buf_dispose(&object_path);
+	git_buf_free(&object_path);
 	return error;
 }
 
@@ -1074,7 +1078,7 @@ static int loose_backend__write(git_odb_backend *_backend, const git_oid *oid, c
 cleanup:
 	if (error < 0)
 		git_filebuf_cleanup(&fbuf);
-	git_buf_dispose(&final_path);
+	git_buf_free(&final_path);
 	return error;
 }
 
@@ -1090,7 +1094,7 @@ static int loose_backend__freshen(
 		return -1;
 
 	error = git_futils_touch(path.ptr, NULL);
-	git_buf_dispose(&path);
+	git_buf_free(&path);
 
 	return error;
 }