From: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
To: git@vger.kernel.org
Cc: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Subject: [PATCH 22/26] clone: define shallow clone boundary with --shallow-exclude
Date: Wed, 13 Apr 2016 19:55:06 +0700 [thread overview]
Message-ID: <1460552110-5554-23-git-send-email-pclouds@gmail.com> (raw)
In-Reply-To: <1460552110-5554-1-git-send-email-pclouds@gmail.com>
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
Documentation/git-clone.txt | 5 +++++
builtin/clone.c | 18 +++++++++++++++++-
2 files changed, 22 insertions(+), 1 deletion(-)
diff --git a/Documentation/git-clone.txt b/Documentation/git-clone.txt
index a410409..5049663 100644
--- a/Documentation/git-clone.txt
+++ b/Documentation/git-clone.txt
@@ -196,6 +196,11 @@ objects from the source repository into a pack in the cloned repository.
--shallow-since=<date>::
Create a shallow clone with a history after the specified time.
+--shallow-exclude=<revision>::
+ Create a shallow clone with a history, excluding commits
+ reachable from a specified remote branch or tag. This option
+ can be specified multiple times.
+
--[no-]single-branch::
Clone only the history leading to the tip of a single branch,
either specified by the `--branch` option or the primary
diff --git a/builtin/clone.c b/builtin/clone.c
index dc2ef4f..5ccf6b7 100644
--- a/builtin/clone.c
+++ b/builtin/clone.c
@@ -44,6 +44,7 @@ static int deepen;
static char *option_template, *option_depth, *option_since;
static char *option_origin = NULL;
static char *option_branch = NULL;
+static struct string_list option_not = STRING_LIST_INIT_NODUP;
static const char *real_git_dir;
static char *option_upload_pack = "git-upload-pack";
static int option_verbosity;
@@ -52,6 +53,13 @@ static struct string_list option_config;
static struct string_list option_reference;
static int option_dissociate;
+static int option_parse_deepen_not(const struct option *opt,
+ const char *arg, int unset)
+{
+ string_list_append(&option_not, arg);
+ return 0;
+}
+
static struct option builtin_clone_options[] = {
OPT__VERBOSITY(&option_verbosity),
OPT_BOOL(0, "progress", &option_progress,
@@ -89,6 +97,9 @@ static struct option builtin_clone_options[] = {
N_("create a shallow clone of that depth")),
OPT_STRING(0, "shallow-since", &option_since, N_("time"),
N_("create a shallow clone since a specific time")),
+ { OPTION_CALLBACK, 0, "shallow-exclude", NULL, N_("revision"),
+ N_("deepen history of shallow clone by excluding rev"),
+ PARSE_OPT_NONEG, option_parse_deepen_not },
OPT_BOOL(0, "single-branch", &option_single_branch,
N_("clone only one branch, HEAD or --branch")),
OPT_STRING(0, "separate-git-dir", &real_git_dir, N_("gitdir"),
@@ -852,7 +863,7 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
usage_msg_opt(_("You must specify a repository to clone."),
builtin_clone_usage, builtin_clone_options);
- if (option_depth || option_since)
+ if (option_depth || option_since || option_not.nr)
deepen = 1;
if (option_single_branch == -1)
option_single_branch = deepen ? 1 : 0;
@@ -983,6 +994,8 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
warning(_("--depth is ignored in local clones; use file:// instead."));
if (option_since)
warning(_("--shallow-since is ignored in local clones; use file:// instead."));
+ if (option_not.nr)
+ warning(_("--shallow-exclude is ignored in local clones; use file:// instead."));
if (!access(mkpath("%s/shallow", path), F_OK)) {
if (option_local > 0)
warning(_("source repository is shallow, ignoring --local"));
@@ -1004,6 +1017,9 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
if (option_since)
transport_set_option(transport, TRANS_OPT_DEEPEN_SINCE,
option_since);
+ if (option_not.nr)
+ transport_set_option(transport, TRANS_OPT_DEEPEN_NOT,
+ (const char *)&option_not);
if (option_single_branch)
transport_set_option(transport, TRANS_OPT_FOLLOWTAGS, "1");
--
2.8.0.rc0.210.gd302cd2
next prev parent reply other threads:[~2016-04-13 12:57 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-13 12:54 [PATCH 00/26] nd/shallow-deepen updates Nguyễn Thái Ngọc Duy
2016-04-13 12:54 ` [PATCH 01/26] remote-curl.c: convert fetch_git() to use argv_array Nguyễn Thái Ngọc Duy
2016-05-25 6:41 ` Eric Sunshine
2016-04-13 12:54 ` [PATCH 02/26] transport-helper.c: refactor set_helper_option() Nguyễn Thái Ngọc Duy
2016-05-25 6:47 ` Eric Sunshine
2016-04-13 12:54 ` [PATCH 03/26] upload-pack: move shallow deepen code out of receive_needs() Nguyễn Thái Ngọc Duy
2016-04-13 12:54 ` [PATCH 04/26] upload-pack: move "shallow" sending code out of deepen() Nguyễn Thái Ngọc Duy
2016-04-13 12:54 ` [PATCH 05/26] upload-pack: remove unused variable "backup" Nguyễn Thái Ngọc Duy
2016-04-13 12:54 ` [PATCH 06/26] upload-pack: move "unshallow" sending code out of deepen() Nguyễn Thái Ngọc Duy
2016-04-13 12:54 ` [PATCH 07/26] upload-pack: use skip_prefix() instead of starts_with() Nguyễn Thái Ngọc Duy
2016-05-25 7:02 ` Eric Sunshine
2016-04-13 12:54 ` [PATCH 08/26] upload-pack: tighten number parsing at "deepen" lines Nguyễn Thái Ngọc Duy
2016-04-13 12:54 ` [PATCH 09/26] upload-pack: move rev-list code out of check_non_tip() Nguyễn Thái Ngọc Duy
2016-05-25 7:36 ` Eric Sunshine
2016-04-13 12:54 ` [PATCH 10/26] fetch-pack: use skip_prefix() instead of starts_with() Nguyễn Thái Ngọc Duy
2016-04-13 12:54 ` [PATCH 11/26] fetch-pack: use a common function for verbose printing Nguyễn Thái Ngọc Duy
2016-04-13 12:54 ` [PATCH 12/26] fetch-pack.c: mark strings for translating Nguyễn Thái Ngọc Duy
2016-04-13 12:54 ` [PATCH 13/26] fetch-pack: use a separate flag for fetch in deepening mode Nguyễn Thái Ngọc Duy
2016-04-13 12:54 ` [PATCH 14/26] shallow.c: implement a generic shallow boundary finder based on rev-list Nguyễn Thái Ngọc Duy
2016-05-27 4:00 ` Eric Sunshine
2016-04-13 12:54 ` [PATCH 15/26] upload-pack: add deepen-since to cut shallow repos based on time Nguyễn Thái Ngọc Duy
2016-04-13 12:55 ` [PATCH 16/26] fetch: define shallow boundary with --shallow-since Nguyễn Thái Ngọc Duy
2016-04-13 12:55 ` [PATCH 17/26] clone: define shallow clone boundary based on time " Nguyễn Thái Ngọc Duy
2016-04-13 12:55 ` [PATCH 18/26] t5500, t5539: tests for shallow depth since a specific date Nguyễn Thái Ngọc Duy
2016-06-05 4:43 ` Eric Sunshine
2016-04-13 12:55 ` [PATCH 19/26] refs: add expand_ref() Nguyễn Thái Ngọc Duy
2016-04-13 12:55 ` [PATCH 20/26] upload-pack: support define shallow boundary by excluding revisions Nguyễn Thái Ngọc Duy
2016-04-13 12:55 ` [PATCH 21/26] fetch: define shallow boundary with --shallow-exclude Nguyễn Thái Ngọc Duy
2016-06-05 5:03 ` Eric Sunshine
2016-04-13 12:55 ` Nguyễn Thái Ngọc Duy [this message]
2016-06-05 5:05 ` [PATCH 22/26] clone: define shallow clone " Eric Sunshine
2016-04-13 12:55 ` [PATCH 23/26] t5500, t5539: tests for shallow depth excluding a ref Nguyễn Thái Ngọc Duy
2016-06-05 5:09 ` Eric Sunshine
2016-04-13 12:55 ` [PATCH 24/26] upload-pack: split check_unreachable() in two, prep for get_reachable_list() Nguyễn Thái Ngọc Duy
2016-06-05 19:43 ` Eric Sunshine
2016-06-10 12:14 ` Duy Nguyen
2016-04-13 12:55 ` [PATCH 25/26] upload-pack: add get_reachable_list() Nguyễn Thái Ngọc Duy
2016-06-05 19:51 ` Eric Sunshine
2016-04-13 12:55 ` [PATCH 26/26] fetch, upload-pack: --deepen=N extends shallow boundary by N commits Nguyễn Thái Ngọc Duy
2016-04-14 16:12 ` [PATCH 00/26] nd/shallow-deepen updates Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1460552110-5554-23-git-send-email-pclouds@gmail.com \
--to=pclouds@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).