From: Duy Nguyen <pclouds@gmail.com>
To: Matthijs Kooijman <matthijs@stdin.nl>
Cc: Junio C Hamano <gitster@pobox.com>,
Jonathan Nieder <jrnieder@gmail.com>,
Stefan Beller <stefanbeller@googlemail.com>,
schlotter@users.sourceforge.net,
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>,
Git Mailing List <git@vger.kernel.org>
Subject: Re: [PATCH 1/3] upload-pack: Remove a piece of dead code
Date: Thu, 11 Jul 2013 19:08:14 +0700 [thread overview]
Message-ID: <CACsJy8CazcJau0yTYSndbam_bUhZLS5f02p9WD0jjutHh1J6+A@mail.gmail.com> (raw)
In-Reply-To: <1373541954-16493-1-git-send-email-matthijs@stdin.nl>
On Thu, Jul 11, 2013 at 6:25 PM, Matthijs Kooijman <matthijs@stdin.nl> wrote:
> Commit 682c7d2 (upload-pack: fix off-by-one depth calculation in shallow
> clone) introduced a new check in get_shallow_commits to decide when to
> stop traversing the history and mark the current commit as a shallow
> root.
>
> With this new check in place, the old check can no longer be true, since
> the first check always fires first. This commit removes that check,
> making the code a bit more simple again.
True. Ack-by: me.
> Signed-off-by: Matthijs Kooijman <matthijs@stdin.nl>
> ---
> shallow.c | 17 ++++++-----------
> 1 file changed, 6 insertions(+), 11 deletions(-)
>
> diff --git a/shallow.c b/shallow.c
> index cbe2526..8a9c96d 100644
> --- a/shallow.c
> +++ b/shallow.c
> @@ -110,17 +110,12 @@ struct commit_list *get_shallow_commits(struct object_array *heads, int depth,
> continue;
> *pointer = cur_depth;
> }
> - if (cur_depth < depth) {
> - if (p->next)
> - add_object_array(&p->item->object,
> - NULL, &stack);
> - else {
> - commit = p->item;
> - cur_depth = *(int *)commit->util;
> - }
> - } else {
> - commit_list_insert(p->item, &result);
> - p->item->object.flags |= shallow_flag;
> + if (p->next)
> + add_object_array(&p->item->object,
> + NULL, &stack);
> + else {
> + commit = p->item;
> + cur_depth = *(int *)commit->util;
> }
> }
> }
> --
> 1.8.3.rc1
>
--
Duy
next prev parent reply other threads:[~2013-07-11 12:08 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-07 18:06 [PATCH] git clone depth of 0 not possible Stefan Beller
2013-01-07 18:06 ` [PATCH] Documentation on depth option in git clone Stefan Beller
2013-01-08 6:28 ` [PATCH] git clone depth of 0 not possible Jonathan Nieder
2013-01-08 6:54 ` Junio C Hamano
2013-01-08 7:36 ` Junio C Hamano
2013-01-08 8:19 ` Junio C Hamano
2013-01-08 14:28 ` Duy Nguyen
2013-01-08 14:32 ` Stefan Beller
2013-01-08 14:45 ` Duy Nguyen
2013-01-08 17:24 ` Junio C Hamano
2013-01-08 7:38 ` Duy Nguyen
2013-01-08 8:05 ` Junio C Hamano
2013-05-28 9:18 ` Matthijs Kooijman
2013-05-28 16:28 ` Jonathan Nieder
2013-05-28 16:31 ` Jonathan Nieder
2013-05-28 16:34 ` Matthijs Kooijman
2013-05-28 16:58 ` Jonathan Nieder
2013-05-28 17:04 ` Junio C Hamano
2013-05-30 8:23 ` Matthijs Kooijman
2013-06-02 19:14 ` Junio C Hamano
2013-07-09 13:35 ` Matthijs Kooijman
2013-07-11 10:57 ` Matthijs Kooijman
2013-07-11 11:25 ` [PATCH 1/3] upload-pack: Remove a piece of dead code Matthijs Kooijman
2013-07-11 11:25 ` [PATCH 2/3] upload-pack: Introduce new "fixed-off-by-one-depth" server feature Matthijs Kooijman
2013-07-11 11:25 ` [PATCH 3/3] fetch-pack: Request fixed-off-by-one-depth when available Matthijs Kooijman
2013-07-11 12:08 ` Duy Nguyen [this message]
2013-07-11 15:49 ` [PATCH 1/3] upload-pack: Remove a piece of dead code Junio C Hamano
2013-01-08 7:33 ` [PATCH] git clone depth of 0 not possible Duy Nguyen
2013-01-08 7:37 ` 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=CACsJy8CazcJau0yTYSndbam_bUhZLS5f02p9WD0jjutHh1J6+A@mail.gmail.com \
--to=pclouds@gmail.com \
--cc=Ralf.Wildenhues@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
--cc=matthijs@stdin.nl \
--cc=schlotter@users.sourceforge.net \
--cc=stefanbeller@googlemail.com \
/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).