rugged 1.0.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3da2dd9613a57a897d79059d83ed3383a8b814dda9dd3b0a850dc52addc354c0
-  data.tar.gz: 27a171313a2b9c7031ec1e5f104676934b16a347487a4533a660b47e98e77eac
+  metadata.gz: 19936f56e898dca579bf9fcf65f00269b370f258cacf7ca8bd5078a87adc4671
+  data.tar.gz: 401815655a41971104e0a4f798c9558caf435810b30f26057b3685f597e1252a
 SHA512:
-  metadata.gz: f5c3e519057e1154b0245b221524fcda071ddaae994c81d277fa466adc20ec38f83d69b6632ab5ab65ceadbd903c400d81f1f31cec8b6b214d14a7b9c48cd390
-  data.tar.gz: e0a2246325bdf104f4d2c9a5654694705d7fd41674f0dd520888067cdfa8939877a05cdaa34baeff954555fd4528ea668af8446ff450f9080601b7e8a0d9b2c6
+  metadata.gz: 1f2c4a448530f16527106b68698d8515680c6bd5bb2e2cccd06ce3abffdae089f8b9a230adc89ce25866c13279ede19a4bb7ba0319f5afc05062e8bcb6046bce
+  data.tar.gz: faad75d0f246a51902dec3f8805fd91dce80add042e737b1bf6df437e41988987e1f88cd9296e798fbba3f94d246e2592895b28d484a63b5b507417a0605d147

data/LICENSE

@@ -1,6 +1,7 @@
 The MIT License
 
 Copyright (c) 2016 GitHub, Inc
+Copyright (c) Rugged Contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -17,9 +17,9 @@ Rugged is a self-contained gem. You can install it by running:
 
     $ gem install rugged
 
-You need to have CMake and `pkg-config` installed on your system to be able to build the included version of `libgit2`. On OS X, after installing [Homebrew](http://brew.sh/), you can get CMake with:
+You need to have CMake and `pkg-config` installed on your system to be able to build the included version of `libgit2`. On OS X, after installing [Homebrew](http://brew.sh/), you can get the required packages with:
 ```bash
-$ brew install cmake
+$ brew install cmake pkg-config
 ```
 
 Please follow the above in case installation of the gem fails with `ERROR: CMake is required to build Rugged.`.
@@ -577,7 +577,7 @@ You can store bare repositories in alternative backends instead of storing on di
 `redbadger/rugged-redis` for an example of how a rugged backend works).
 
 ```ruby
-a_backend = Rugged::InMemory::Backend.new(opt1: 'setting', opt2: 'setting')
+a_backend = MyProject::CustomObjectDB(opt1: 'setting', opt2: 'setting')
 
 repo = Rugged::Repository.init_at('repo_name', :bare, backend: a_backend)
 

data/ext/rugged/rugged.c

@@ -220,15 +220,18 @@ static VALUE rb_git_prettify_message(int argc, VALUE *argv, VALUE self)
 	return result;
 }
 
-static VALUE minimize_cb(VALUE rb_oid, git_oid_shorten *shortener)
+static VALUE minimize_cb(RB_BLOCK_CALL_FUNC_ARGLIST(rb_oid, shorten))
 {
+	git_oid_shorten *shortener = (git_oid_shorten*) shorten;
+
 	Check_Type(rb_oid, T_STRING);
 	git_oid_shorten_add(shortener, RSTRING_PTR(rb_oid));
 	return Qnil;
 }
 
-static VALUE minimize_yield(VALUE rb_oid, VALUE *data)
+static VALUE minimize_yield(RB_BLOCK_CALL_FUNC_ARGLIST(rb_oid, args))
 {
+	VALUE *data = (VALUE*) args;
 	rb_funcall(data[0], rb_intern("call"), 1,
 		rb_str_substr(rb_oid, 0, FIX2INT(data[1])));
 	return Qnil;
@@ -293,7 +296,7 @@ static VALUE rb_git_minimize_oid(int argc, VALUE *argv, VALUE self)
 
 	shrt = git_oid_shorten_new(minlen);
 
-	rb_iterate(rb_each, rb_enum, &minimize_cb, (VALUE)shrt);
+	rb_block_call(rb_enum, rb_intern("each"), 0, NULL, minimize_cb, (VALUE)shrt);
 	length = git_oid_shorten_add(shrt, NULL);
 
 	git_oid_shorten_free(shrt);
@@ -305,7 +308,7 @@ static VALUE rb_git_minimize_oid(int argc, VALUE *argv, VALUE self)
 		yield_data[0] = rb_block;
 		yield_data[1] = INT2FIX(length);
 
-		rb_iterate(rb_each, rb_enum, &minimize_yield, (VALUE)yield_data);
+		rb_block_call(rb_enum, rb_intern("each"), 0, NULL, minimize_yield, (VALUE)yield_data);
 		return Qnil;
 	}
 

data/ext/rugged/rugged_commit.c

@@ -425,7 +425,7 @@ struct commit_data {
  * Note that parents may be set even when the function errors, so make
  * sure to free this data.
  */
-static VALUE parse_commit_options(struct commit_data *out, git_repository *repo, VALUE rb_data)
+static int parse_commit_options(struct commit_data *out, git_repository *repo, VALUE rb_data)
 {
 	VALUE rb_message, rb_tree, rb_parents, rb_ref;
 	int error = 0, parent_count, i;

data/ext/rugged/rugged_config.c

@@ -173,7 +173,7 @@ static int cb_config__each_key(const git_config_entry *entry, void *payload)
 {
 	int *exception = (int *) payload;
 
-	rb_protect(rb_yield, rb_ary_new3(1, rb_str_new_utf8(entry->name)), exception);
+	rb_protect(rb_yield, rb_str_new_utf8(entry->name), exception);
 
 	return (*exception != 0) ? GIT_EUSER : GIT_OK;
 }

data/ext/rugged/rugged_object.c

@@ -400,7 +400,7 @@ static VALUE rb_git_object_read_raw(VALUE self)
 
 void Init_rugged_object(void)
 {
-	rb_cRuggedObject = rb_define_class_under(rb_mRugged, "Object", rb_cData);
+	rb_cRuggedObject = rb_define_class_under(rb_mRugged, "Object", rb_cObject);
 	rb_define_singleton_method(rb_cRuggedObject, "lookup", rb_git_object_lookup, 2);
 	rb_define_singleton_method(rb_cRuggedObject, "rev_parse", rb_git_object_rev_parse, 2);
 	rb_define_singleton_method(rb_cRuggedObject, "rev_parse_oid", rb_git_object_rev_parse_oid, 2);

data/ext/rugged/rugged_remote.c

@@ -207,6 +207,18 @@ static void init_custom_headers(VALUE rb_options, git_strarray *custom_headers)
 	}
 }
 
+static void init_proxy_options(VALUE rb_options, git_proxy_options *proxy_options)
+{
+	if (NIL_P(rb_options)) return;
+
+	VALUE val = rb_hash_aref(rb_options, CSTR2SYM("proxy_url"));
+	if (!NIL_P(val)) {
+		Check_Type(val, T_STRING);
+		proxy_options->type = GIT_PROXY_SPECIFIED;
+		proxy_options->url = StringValueCStr(val);
+	}
+}
+
 static int parse_prune_type(VALUE rb_prune_type)
 {
 	if (rb_prune_type == Qtrue) {
@@ -283,11 +295,15 @@ static VALUE rugged_rhead_new(const git_remote_head *head)
  *
  *  :headers ::
  *    Extra HTTP headers to include with the request (only applies to http:// or https:// remotes)
+ *
+ *  :proxy_url ::
+ *    The url of an http proxy to use to access the remote repository.
  */
 static VALUE rb_git_remote_ls(int argc, VALUE *argv, VALUE self)
 {
 	git_remote *remote;
 	git_remote_callbacks callbacks = GIT_REMOTE_CALLBACKS_INIT;
+	git_proxy_options proxy_options = GIT_PROXY_OPTIONS_INIT;
 	git_strarray custom_headers = {0};
 	const git_remote_head **heads;
 
@@ -304,8 +320,9 @@ static VALUE rb_git_remote_ls(int argc, VALUE *argv, VALUE self)
 
 	rugged_remote_init_callbacks_and_payload_from_options(rb_options, &callbacks, &payload);
 	init_custom_headers(rb_options, &custom_headers);
+	init_proxy_options(rb_options, &proxy_options);
 
-	if ((error = git_remote_connect(remote, GIT_DIRECTION_FETCH, &callbacks, NULL, &custom_headers)) ||
+	if ((error = git_remote_connect(remote, GIT_DIRECTION_FETCH, &callbacks, &proxy_options, &custom_headers)) ||
 	    (error = git_remote_ls(&heads, &heads_len, remote)))
 		goto cleanup;
 
@@ -474,6 +491,9 @@ static VALUE rb_git_remote_push_refspecs(VALUE self)
  *  :headers ::
  *    Extra HTTP headers to include with the request (only applies to http:// or https:// remotes)
  *
+ *  :proxy_url ::
+ *    The url of an http proxy to use to access the remote repository.
+ *
  *  Example:
  *
  *    remote = repo.remotes["origin"]
@@ -484,6 +504,7 @@ static VALUE rb_git_remote_check_connection(int argc, VALUE *argv, VALUE self)
 {
 	git_remote *remote;
 	git_remote_callbacks callbacks = GIT_REMOTE_CALLBACKS_INIT;
+	git_proxy_options proxy_options = GIT_PROXY_OPTIONS_INIT;
 	git_strarray custom_headers = {0};
 	struct rugged_remote_cb_payload payload = { Qnil, Qnil, Qnil, Qnil, Qnil, Qnil, Qnil, 0 };
 	VALUE rb_direction, rb_options;
@@ -504,8 +525,9 @@ static VALUE rb_git_remote_check_connection(int argc, VALUE *argv, VALUE self)
 
 	rugged_remote_init_callbacks_and_payload_from_options(rb_options, &callbacks, &payload);
 	init_custom_headers(rb_options, &custom_headers);
+	init_proxy_options(rb_options, &proxy_options);
 
-	error = git_remote_connect(remote, direction, &callbacks, NULL, &custom_headers);
+	error = git_remote_connect(remote, direction, &callbacks, &proxy_options, &custom_headers);
 	git_remote_disconnect(remote);
 
 	xfree(custom_headers.strings);
@@ -563,6 +585,9 @@ static VALUE rb_git_remote_check_connection(int argc, VALUE *argv, VALUE self)
  *    Specifies the prune mode for the fetch. +true+ remove any remote-tracking references that
  *    no longer exist, +false+ do not prune, +nil+ use configured settings Defaults to "nil".
  *
+ *  :proxy_url ::
+ *    The url of an http proxy to use to access the remote repository.
+ *
  *  Example:
  *
  *    remote = Rugged::Remote.lookup(@repo, 'origin')
@@ -593,6 +618,7 @@ static VALUE rb_git_remote_fetch(int argc, VALUE *argv, VALUE self)
 
 	rugged_remote_init_callbacks_and_payload_from_options(rb_options, &opts.callbacks, &payload);
 	init_custom_headers(rb_options, &opts.custom_headers);
+	init_proxy_options(rb_options, &opts.proxy_opts);
 
 	if (!NIL_P(rb_options)) {
 		VALUE rb_prune_type;
@@ -654,6 +680,9 @@ static VALUE rb_git_remote_fetch(int argc, VALUE *argv, VALUE self)
  *  :headers ::
  *    Extra HTTP headers to include with the push (only applies to http:// or https:// remotes)
  *
+ *  :proxy_url ::
+ *    The url of an http proxy to use to access the remote repository.
+ *
  *  Example:
  *
  *    remote = Rugged::Remote.lookup(@repo, 'origin')
@@ -679,6 +708,7 @@ static VALUE rb_git_remote_push(int argc, VALUE *argv, VALUE self)
 
 	rugged_remote_init_callbacks_and_payload_from_options(rb_options, &opts.callbacks, &payload);
 	init_custom_headers(rb_options, &opts.custom_headers);
+	init_proxy_options(rb_options, &opts.proxy_opts);
 
 	error = git_remote_push(remote, &refspecs, &opts);
 

data/ext/rugged/rugged_repo.c

@@ -528,6 +528,13 @@ static void parse_clone_options(git_clone_options *ret, VALUE rb_options, struct
 		ret->checkout_branch = StringValueCStr(val);
 	}
 
+	val = rb_hash_aref(rb_options, CSTR2SYM("proxy_url"));
+	if (!NIL_P(val)) {
+		Check_Type(val, T_STRING);
+		ret->fetch_opts.proxy_opts.type = GIT_PROXY_SPECIFIED;
+		ret->fetch_opts.proxy_opts.url = StringValueCStr(val);
+	}
+
 	rugged_remote_init_callbacks_and_payload_from_options(rb_options, &ret->fetch_opts.callbacks, remote_payload);
 }
 
@@ -552,6 +559,9 @@ static void parse_clone_options(git_clone_options *ret, VALUE rb_options, struct
  *  :ignore_cert_errors ::
  *    If set to +true+, errors while validating the remote's host certificate will be ignored.
  *
+ *  :proxy_url ::
+ *    The url of an http proxy to use to access the remote repository.
+ *
  *  :credentials ::
  *    The credentials to use for the clone operation. Can be either an instance of one
  *    of the Rugged::Credentials types, or a proc returning one of the former.
@@ -1450,8 +1460,8 @@ static VALUE rb_git_repo_is_shallow(VALUE self)
  *  call-seq:
  *    repo.empty? -> true or false
  *
- *  Return whether a repository is empty or not. An empty repository has just
- *  been initialized and has no commits yet.
+ *  Return whether a repository is empty or not. An empty repository has HEAD
+ *  pointing to the default value and there are no other references.
  */
 static VALUE rb_git_repo_is_empty(VALUE self)
 {
@@ -2835,7 +2845,7 @@ void Init_rugged_repo(void)
 	rb_define_method(rb_cRuggedRepo, "cherrypick_commit", rb_git_repo_cherrypick_commit, -1);
 	rb_define_method(rb_cRuggedRepo, "fetch_attributes", rb_git_repo_attributes, -1);
 
-	rb_cRuggedOdbObject = rb_define_class_under(rb_mRugged, "OdbObject", rb_cData);
+	rb_cRuggedOdbObject = rb_define_class_under(rb_mRugged, "OdbObject", rb_cObject);
 	rb_define_method(rb_cRuggedOdbObject, "data",  rb_git_odbobj_data,  0);
 	rb_define_method(rb_cRuggedOdbObject, "len",  rb_git_odbobj_size,  0);
 	rb_define_method(rb_cRuggedOdbObject, "type",  rb_git_odbobj_type,  0);

data/lib/rugged/commit.rb

@@ -5,7 +5,6 @@
 
 module Rugged
   class Commit
-
     def self.prettify_message(msg, strip_comments = true)
       Rugged::prettify_message(msg, strip_comments)
     end
@@ -20,17 +19,31 @@ module Rugged
 
     # Return a diff between this commit and its first parent or another commit or tree.
     #
+    # The commit is treated as the new side of the diff by default
+    #
     # See Rugged::Tree#diff for more details.
     def diff(*args)
-      args.unshift(parents.first) if args.size == 1 && args.first.is_a?(Hash)
-      self.tree.diff(*args)
+      raise ArgumentError("wrong number of arguments (given #{args.length}, expected 0..2") if args.length > 2
+      other, opts = args
+      if other.is_a?(Hash)
+        opts = other
+        other = nil
+      end
+      opts ||= {}
+      # if other is not provided at all (as opposed to explicitly nil, or given)
+      # then diff against the prior commit
+      if args.empty? || args.first.is_a?(Hash)
+        other = parents.first
+        opts[:reverse] = !opts[:reverse]
+      end
+      self.tree.diff(other, opts)
     end
 
     # Return a diff between this commit and the workdir.
     #
     # See Rugged::Tree#diff_workdir for more details.
     def diff_workdir(options = {})
-      self.tree.diff_workdir(options)
+      self.tree.diff_workdir(**options)
     end
 
     # The time when this commit was made effective. This is the same value

data/lib/rugged/repository.rb

@@ -30,7 +30,7 @@ module Rugged
       options[:strategy] ||= :safe
       options.delete(:paths)
 
-      return checkout_head(options) if target == "HEAD"
+      return checkout_head(**options) if target == "HEAD"
 
       if target.kind_of?(Rugged::Branch)
         branch = target
@@ -39,7 +39,7 @@ module Rugged
       end
 
       if branch
-        self.checkout_tree(branch.target, options)
+        self.checkout_tree(branch.target, **options)
 
         if branch.remote?
           references.create("HEAD", branch.target_id, force: true)
@@ -49,7 +49,7 @@ module Rugged
       else
         commit = Commit.lookup(self, self.rev_parse_oid(target))
         references.create("HEAD", commit.oid, force: true)
-        self.checkout_tree(commit, options)
+        self.checkout_tree(commit, **options)
       end
     end
 
@@ -250,12 +250,11 @@ module Rugged
       (blob.type == :blob) ? blob : nil
     end
 
-    def fetch(remote_or_url, *args)
+    def fetch(remote_or_url, *args, **kwargs)
       unless remote_or_url.kind_of? Remote
         remote_or_url = remotes[remote_or_url] || remotes.create_anonymous(remote_or_url)
       end
-
-      remote_or_url.fetch(*args)
+      remote_or_url.fetch(*args, **kwargs)
     end
 
     # Push a list of refspecs to the given remote.
@@ -264,12 +263,12 @@ module Rugged
     #
     # Returns a hash containing the pushed refspecs as keys and
     # any error messages or +nil+ as values.
-    def push(remote_or_url, *args)
+    def push(remote_or_url, *args, **kwargs)
       unless remote_or_url.kind_of? Remote
         remote_or_url = remotes[remote_or_url] || remotes.create_anonymous(remote_or_url)
       end
 
-      remote_or_url.push(*args)
+      remote_or_url.push(*args, **kwargs)
     end
   end
 end

data/lib/rugged/submodule_collection.rb

@@ -26,8 +26,8 @@ module Rugged
     #
     # Returns the newly created +submodule+
     def add(url, path, options = {})
-      submodule = setup_add(url, path, options)
-      clone_submodule(submodule.repository, options)
+      submodule = setup_add(url, path, **options)
+      clone_submodule(submodule.repository, **options)
       submodule.finalize_add
     end
 
@@ -40,9 +40,9 @@ module Rugged
     # 1. fetches the remote
     # 2. sets up a master branch to be tracking origin/master
     # 3. checkouts the submodule
-    def clone_submodule(repo, fetch_options)
+    def clone_submodule(repo, **fetch_options)
       # the remote was just added by setup_add, no need to check presence
-      repo.remotes['origin'].fetch(fetch_options)
+      repo.remotes['origin'].fetch(**fetch_options)
 
       repo.branches.create('master','origin/master')
       repo.branches['master'].upstream = repo.branches['origin/master']

data/lib/rugged/version.rb

@@ -4,5 +4,5 @@
 # For full terms see the included LICENSE file.
 
 module Rugged
-  Version = VERSION = '1.0.0'
+  Version = VERSION = '1.2.0'
 end

data/vendor/libgit2/CMakeLists.txt

@@ -11,21 +11,12 @@
 # Install:
 # > cmake --build . --target install
 
-PROJECT(libgit2 C)
 CMAKE_MINIMUM_REQUIRED(VERSION 3.5.1)
-CMAKE_POLICY(SET CMP0015 NEW)
-IF(POLICY CMP0051)
-	CMAKE_POLICY(SET CMP0051 NEW)
-ENDIF()
-IF(POLICY CMP0042)
-	CMAKE_POLICY(SET CMP0042 NEW)
-ENDIF()
-IF(POLICY CMP0054)
-	CMAKE_POLICY(SET CMP0054 NEW)
-ENDIF()
+
+project(libgit2 VERSION "1.2.0" LANGUAGES C)
 
 # Add find modules to the path
-SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${libgit2_SOURCE_DIR}/cmake/Modules/")
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${libgit2_SOURCE_DIR}/cmake/")
 
 INCLUDE(CheckLibraryExists)
 INCLUDE(CheckFunctionExists)
@@ -36,6 +27,7 @@ INCLUDE(AddCFlagIfSupported)
 INCLUDE(FindPkgLibraries)
 INCLUDE(FindThreads)
 INCLUDE(FindStatNsec)
+INCLUDE(Findfutimens)
 INCLUDE(GNUInstallDirs)
 INCLUDE(IdeSplitSources)
 INCLUDE(FeatureSummary)
@@ -49,8 +41,6 @@ OPTION(THREADSAFE			"Build libgit2 as threadsafe"				 ON)
 OPTION(BUILD_CLAR			"Build Tests using the Clar suite"			 ON)
 OPTION(BUILD_EXAMPLES			"Build library usage example apps"			OFF)
 OPTION(BUILD_FUZZERS			"Build the fuzz targets"				OFF)
-OPTION(TAGS				"Generate tags"						OFF)
-OPTION(PROFILE				"Generate profiling information"			OFF)
 OPTION(ENABLE_TRACE			"Enables tracing support"				ON)
 OPTION(LIBGIT2_FILENAME			"Name of the produced binary"				OFF)
 OPTION(USE_SSH				"Link with libssh2 to enable SSH support"		 ON)
@@ -60,8 +50,10 @@ OPTION(USE_GSSAPI			"Link with libgssapi for SPNEGO auth"			OFF)
 OPTION(USE_STANDALONE_FUZZERS		"Enable standalone fuzzers (compatible with gcc)"	OFF)
 OPTION(USE_LEAK_CHECKER			"Run tests with leak checker"				OFF)
 OPTION(DEBUG_POOL			"Enable debug pool allocator"				OFF)
+OPTION(DEBUG_STRICT_ALLOC		"Enable strict allocator behavior"			OFF)
+OPTION(DEBUG_STRICT_OPEN		"Enable path validation in open"			OFF)
 OPTION(ENABLE_WERROR			"Enable compilation with -Werror"			OFF)
-OPTION(USE_BUNDLED_ZLIB    		"Use the bundled version of zlib"			OFF)
+OPTION(USE_BUNDLED_ZLIB    		"Use the bundled version of zlib. Can be set to one of Bundled(ON)/Chromium. The Chromium option requires a x86_64 processor with SSE4.2 and CLMUL"			OFF)
    SET(USE_HTTP_PARSER			"" CACHE STRING "Specifies the HTTP Parser implementation; either system or builtin.")
 OPTION(DEPRECATE_HARD			"Do not include deprecated functions in the library"	OFF)
    SET(REGEX_BACKEND			"" CACHE STRING "Regular expression implementation. One of regcomp_l, pcre2, pcre, regcomp, or builtin.")
@@ -100,20 +92,10 @@ IF(WIN32)
 ENDIF()
 
 IF(MSVC)
-	# Enable MSVC CRTDBG memory leak reporting when in debug mode.
-	OPTION(MSVC_CRTDBG 		"Enable CRTDBG memory leak reporting"			OFF)
+	# Enable leak checking using the debugging C runtime.
+	OPTION(WIN32_LEAKCHECK		"Enable leak reporting via crtdbg"			OFF)
 ENDIF()
 
-FILE(STRINGS "${libgit2_SOURCE_DIR}/include/git2/version.h" GIT2_HEADER REGEX "^#define LIBGIT2_VERSION \"[^\"]*\"$")
-
-STRING(REGEX REPLACE "^.*LIBGIT2_VERSION \"([0-9]+).*$" "\\1" LIBGIT2_VERSION_MAJOR "${GIT2_HEADER}")
-STRING(REGEX REPLACE "^.*LIBGIT2_VERSION \"[0-9]+\\.([0-9]+).*$" "\\1" LIBGIT2_VERSION_MINOR  "${GIT2_HEADER}")
-STRING(REGEX REPLACE "^.*LIBGIT2_VERSION \"[0-9]+\\.[0-9]+\\.([0-9]+).*$" "\\1" LIBGIT2_VERSION_REV "${GIT2_HEADER}")
-SET(LIBGIT2_VERSION_STRING "${LIBGIT2_VERSION_MAJOR}.${LIBGIT2_VERSION_MINOR}.${LIBGIT2_VERSION_REV}")
-
-FILE(STRINGS "${libgit2_SOURCE_DIR}/include/git2/version.h" GIT2_HEADER_SOVERSION REGEX "^#define LIBGIT2_SOVERSION \"([0-9.]+)\"$")
-STRING(REGEX REPLACE "^.*LIBGIT2_SOVERSION \"([0-9.]+)\"$" "\\1" LIBGIT2_SOVERSION "${GIT2_HEADER_SOVERSION}")
-
 IF (DEPRECATE_HARD)
 	ADD_DEFINITIONS(-DGIT_DEPRECATE_HARD)
 ENDIF()
@@ -137,6 +119,11 @@ IF (MSVC)
 	# /Gd - explicitly set cdecl calling convention
 	SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /Gd")
 
+	IF (NOT (MSVC_VERSION LESS 1900))
+		# /guard:cf - Enable Control Flow Guard
+		SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /guard:cf")
+	ENDIF()
+
 	IF (STATIC_CRT)
 		SET(CRT_FLAG_DEBUG "/MTd")
 		SET(CRT_FLAG_RELEASE "/MT")
@@ -145,8 +132,8 @@ IF (MSVC)
 		SET(CRT_FLAG_RELEASE "/MD")
 	ENDIF()
 
-	IF (MSVC_CRTDBG)
-		SET(GIT_MSVC_CRTDBG 1)
+	IF (WIN32_LEAKCHECK)
+		SET(GIT_WIN32_LEAKCHECK 1)
 		SET(CRT_FLAG_DEBUG "${CRT_FLAG_DEBUG}")
 		SET(CMAKE_C_STANDARD_LIBRARIES "${CMAKE_C_STANDARD_LIBRARIES} Dbghelp.lib")
 	ENDIF()
@@ -181,7 +168,12 @@ IF (MSVC)
 	# /NXCOMPAT - Data execution prevention (DEP)
 	# /LARGEADDRESSAWARE - >2GB user address space on x86
 	# /VERSION - Embed version information in PE header
-	SET(CMAKE_EXE_LINKER_FLAGS "/DYNAMICBASE /NXCOMPAT /LARGEADDRESSAWARE /VERSION:${LIBGIT2_VERSION_MAJOR}.${LIBGIT2_VERSION_MINOR}")
+	SET(CMAKE_EXE_LINKER_FLAGS "/DYNAMICBASE /NXCOMPAT /LARGEADDRESSAWARE /VERSION:${libgit2_VERSION_MAJOR}.${libgit2_VERSION_MINOR}")
+
+	IF (NOT (MSVC_VERSION LESS 1900))
+		# /GUARD:CF - Enable Control Flow Guard
+		SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /GUARD:CF")
+	ENDIF()
 
 	# /DEBUG - Create a PDB
 	# /LTCG - Link time code generation (whole program optimization)
@@ -232,35 +224,29 @@ ELSE ()
 		ADD_DEFINITIONS(-D__USE_MINGW_ANSI_STDIO=1)
 	ENDIF ()
 
-	ENABLE_WARNINGS(documentation)
-	DISABLE_WARNINGS(missing-field-initializers)
-	ENABLE_WARNINGS(strict-aliasing)
-	ENABLE_WARNINGS(strict-prototypes)
-	ENABLE_WARNINGS(declaration-after-statement)
-	ENABLE_WARNINGS(shift-count-overflow)
-	ENABLE_WARNINGS(unused-const-variable)
-	ENABLE_WARNINGS(unused-function)
-	ENABLE_WARNINGS(int-conversion)
+	enable_warnings(documentation)
+	disable_warnings(documentation-deprecated-sync)
+	disable_warnings(missing-field-initializers)
+	enable_warnings(strict-aliasing)
+	enable_warnings(strict-prototypes)
+	enable_warnings(declaration-after-statement)
+	enable_warnings(shift-count-overflow)
+	enable_warnings(unused-const-variable)
+	enable_warnings(unused-function)
+	enable_warnings(int-conversion)
+	enable_warnings(c11-extensions)
+	enable_warnings(c99-c11-compat)
 
 	# MinGW uses gcc, which expects POSIX formatting for printf, but
 	# uses the Windows C library, which uses its own format specifiers.
 	# Disable format specifier warnings.
-	IF(MINGW)
-		DISABLE_WARNINGS(format)
-		DISABLE_WARNINGS(format-security)
-	ELSE()
-		ENABLE_WARNINGS(format)
-		ENABLE_WARNINGS(format-security)
-	ENDIF()
-
-	IF("${CMAKE_C_COMPILER_ID}" STREQUAL "Clang")
-		DISABLE_WARNINGS(documentation-deprecated-sync)
-	ENDIF()
-
-	IF (PROFILE)
-		SET(CMAKE_C_FLAGS "-pg ${CMAKE_C_FLAGS}")
-		SET(CMAKE_EXE_LINKER_FLAGS "-pg ${CMAKE_EXE_LINKER_FLAGS}")
-	ENDIF ()
+	if(MINGW)
+		disable_warnings(format)
+		disable_warnings(format-security)
+	else()
+		enable_warnings(format)
+		enable_warnings(format-security)
+	endif()
 ENDIF()
 
 # Ensure that MinGW provides the correct header files.
@@ -300,25 +286,6 @@ IF (BUILD_CLAR)
 	ADD_SUBDIRECTORY(tests)
 ENDIF ()
 
-IF (TAGS)
-	FIND_PROGRAM(CTAGS ctags)
-	IF (NOT CTAGS)
-		MESSAGE(FATAL_ERROR "Could not find ctags command")
-	ENDIF ()
-
-	FILE(GLOB_RECURSE SRC_ALL *.[ch])
-
-	ADD_CUSTOM_COMMAND(
-		OUTPUT tags
-		COMMAND ${CTAGS} -a ${SRC_ALL}
-		DEPENDS ${SRC_ALL}
-	)
-	ADD_CUSTOM_TARGET(
-		do_tags ALL
-		DEPENDS tags
-	)
-ENDIF ()
-
 IF (BUILD_EXAMPLES)
 	ADD_SUBDIRECTORY(examples)
 ENDIF ()