Re: [PATCH 1/3] upload-pack: Remove a piece of dead code
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Jul 11, 2013, 15:49 UTC
- Message-ID
- <7vy59drta7.fsf@alter.siamese.dyndns.org>
- In-Reply-To
- <CACsJy8CazcJau0yTYSndbam_bUhZLS5f02p9WD0jjutHh1J6+A@mail.gmail.com>
Duy Nguyen <pclouds@gmail.com> writes:
Show 13 quoted lines
> 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>
Yeah, thanks both. I tend to agree that 2 and 3 are the right change that came too late after the ship sailed X-(.
Show 37 quoted lines
>> ---
>> 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