Merge pull request #980 from Bo98/fetch-depth

Support setting fetch depth

Author: carlosmn

ext/rugged/rugged.h

@@ -185,6 +185,8 @@ struct rugged_remote_cb_payload
 	int exception;
 };
 
+void rugged_remote_init_fetch_options(VALUE rb_options, git_fetch_options *fetch_options);
+
 void rugged_remote_init_custom_headers(VALUE rb_options, git_strarray *custom_headers);
 
 void rugged_remote_init_proxy_options(VALUE rb_options, git_proxy_options *proxy_options);

ext/rugged/rugged_remote.c

@@ -159,6 +159,21 @@ static int credentials_cb(
 	return payload->exception ? GIT_ERROR : GIT_OK;
 }
 
+void rugged_remote_init_fetch_options(VALUE rb_options, git_fetch_options *fetch_options)
+{
+	rugged_remote_init_custom_headers(rb_options, &fetch_options->custom_headers);
+	rugged_remote_init_proxy_options(rb_options, &fetch_options->proxy_opts);
+
+	if (!NIL_P(rb_options))
+	{
+		VALUE depth = rb_hash_aref(rb_options, CSTR2SYM("depth"));
+		if (!NIL_P(depth)) {
+			Check_Type(depth, T_FIXNUM);
+			fetch_options->depth = FIX2UINT(depth);
+		}
+	}
+}
+
 void rugged_remote_init_callbacks_and_payload_from_options(
 	VALUE rb_options,
 	git_remote_callbacks *callbacks,
@@ -639,8 +654,7 @@ static VALUE rb_git_remote_fetch(int argc, VALUE *argv, VALUE self)
 	TypedData_Get_Struct(self, git_remote, &rugged_remote_type, remote);
 
 	rugged_remote_init_callbacks_and_payload_from_options(rb_options, &opts.callbacks, &payload);
-	rugged_remote_init_custom_headers(rb_options, &opts.custom_headers);
-	rugged_remote_init_proxy_options(rb_options, &opts.proxy_opts);
+	rugged_remote_init_fetch_options(rb_options, &opts);
 
 	if (!NIL_P(rb_options)) {
 		VALUE rb_prune_type;

ext/rugged/rugged_repo.c

@@ -542,8 +542,7 @@ static void parse_clone_options(git_clone_options *ret, VALUE rb_options, struct
 	}
 
 	rugged_remote_init_callbacks_and_payload_from_options(rb_options, &ret->fetch_opts.callbacks, remote_payload);
-	rugged_remote_init_custom_headers(rb_options, &ret->fetch_opts.custom_headers);
-	rugged_remote_init_proxy_options(rb_options, &ret->fetch_opts.proxy_opts);
+	rugged_remote_init_fetch_options(rb_options, &ret->fetch_opts);
 }
 
 /*

test/online/fetch_test.rb

@@ -79,6 +79,16 @@ def test_fetch_over_https_with_certificate_callback_exception
     assert_equal "Exception from callback", exception.message
   end
 
+  def test_fetch_over_https_shallow
+    skip unless Rugged.features.include?(:https)
+
+    @repo.remotes.create("origin", "https://github.com/libgit2/TestGitRepository.git")
+
+    @repo.fetch("origin", :depth => 1)
+
+    assert @repo.shallow?
+  end
+
   def test_fetch_over_ssh_with_credentials
     skip unless Rugged.features.include?(:ssh) && ssh_creds?