From: Junio C Hamano <gitster@pobox•com>
To: Jonathan Tan <jonathantanmy@google•com>
Cc: git@vger•kernel.org, sbeller@google•com
Subject: Re: [PATCH v2 00/25] Move exported packfile funcs to its own file
Date: Thu, 10 Aug 2017 15:40:28 -0700 [thread overview]
Message-ID: <xmqqfucz11yb.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <20170810145948.60c2b9f8@twelve2.svl.corp.google.com> (Jonathan Tan's message of "Thu, 10 Aug 2017 14:59:48 -0700")
Jonathan Tan <jonathantanmy@google•com> writes:
> On Thu, 10 Aug 2017 14:19:59 -0700
> Junio C Hamano <gitster@pobox•com> wrote:
>
>> Jonathan Tan <jonathantanmy@google•com> writes:
>>
>> > Here is the complete patch set. I have only moved the exported functions
>> > that operate with packfiles and their static helpers - for example,
>> > static functions like freshen_packed_object() that are used only by
>> > non-pack-specific functions are not moved.
>>
>> This will interfere with smaller changes and fixes we want to have
>> early in the 'master' branch, so while I think it is a good idea to
>> do something like this in the longer term, I'd have to ask you to
>> either hold on or rebase this on them (you'll know what else you are
>> conflicting with when you try to merge this to 'pu' yourself).
>>
>> Thanks.
>
> OK, I'll wait until you have updated the master branch, then I'll try to
> rebase on it.
That will take a few weeks, and I do not think we want you idling
during that time ;-).
You'd need to double check, but I think the topics that cause
trouble are rs/find-apck-entry-bisection and jk/drop-sha1-entry-pos;
you can start from v2.14.1 and merge these topics on top and then
build your change on top. That would allow you to start cooking
before both of them graduate to 'master', as I expect they are both
quick-to-next material. There might be other topics that interfere
with what you are doing, but you can easily find out what they are
if you do a trial merge to 'next' and 'pu' yourself.
Thanks.
next prev parent reply other threads:[~2017-08-10 22:40 UTC|newest]
Thread overview: 88+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-08 19:32 [RFC PATCH 00/10] An attempt to move packfile funcs to its own file Jonathan Tan
2017-08-08 19:32 ` [RFC PATCH 01/10] pack: move pack name-related functions Jonathan Tan
2017-08-08 20:36 ` Stefan Beller
2017-08-08 20:50 ` Jonathan Tan
2017-08-09 12:00 ` Christian Couder
2017-08-09 17:16 ` Jonathan Tan
2017-08-11 19:38 ` Ben Peart
2017-08-11 21:34 ` Junio C Hamano
2017-08-16 22:53 ` Jonathan Tan
2017-08-08 19:32 ` [RFC PATCH 02/10] pack: move static state variables Jonathan Tan
2017-08-08 19:32 ` [RFC PATCH 03/10] pack: move pack_report() Jonathan Tan
2017-08-08 19:32 ` [RFC PATCH 04/10] pack: move open_pack_index(), parse_pack_index() Jonathan Tan
2017-08-08 20:19 ` Junio C Hamano
2017-08-08 20:45 ` Jonathan Tan
2017-08-08 19:32 ` [RFC PATCH 05/10] pack: move release_pack_memory() Jonathan Tan
2017-08-08 19:32 ` [RFC PATCH 06/10] pack: move pack-closing functions Jonathan Tan
2017-08-08 19:32 ` [RFC PATCH 07/10] pack: move use_pack() Jonathan Tan
2017-08-08 19:32 ` [RFC PATCH 08/10] pack: move unuse_pack() Jonathan Tan
2017-08-08 19:32 ` [RFC PATCH 09/10] pack: move add_packed_git() Jonathan Tan
2017-08-08 19:32 ` [RFC PATCH 10/10] pack: move install_packed_git() Jonathan Tan
2017-08-08 20:05 ` [RFC PATCH 00/10] An attempt to move packfile funcs to its own file Junio C Hamano
2017-08-08 20:43 ` Jonathan Tan
2017-08-08 21:04 ` Junio C Hamano
2017-08-09 1:22 ` [PATCH v2 00/25] Move exported " Jonathan Tan
2017-08-09 1:22 ` [PATCH v2 01/25] pack: move pack name-related functions Jonathan Tan
2017-08-09 1:22 ` [PATCH v2 02/25] pack: move static state variables Jonathan Tan
2017-08-09 1:22 ` [PATCH v2 03/25] pack: move pack_report() Jonathan Tan
2017-08-09 1:22 ` [PATCH v2 04/25] pack: move open_pack_index(), parse_pack_index() Jonathan Tan
2017-08-09 1:22 ` [PATCH v2 05/25] pack: move release_pack_memory() Jonathan Tan
2017-08-09 1:22 ` [PATCH v2 06/25] pack: move pack-closing functions Jonathan Tan
2017-08-09 1:22 ` [PATCH v2 07/25] pack: move use_pack() Jonathan Tan
2017-08-09 1:22 ` [PATCH v2 08/25] pack: move unuse_pack() Jonathan Tan
2017-08-09 1:22 ` [PATCH v2 09/25] pack: move add_packed_git() Jonathan Tan
2017-08-09 1:22 ` [PATCH v2 10/25] pack: move install_packed_git() Jonathan Tan
2017-08-09 1:22 ` [PATCH v2 11/25] pack: move {,re}prepare_packed_git and approximate_object_count Jonathan Tan
2017-08-09 1:22 ` [PATCH v2 12/25] pack: move unpack_object_header() Jonathan Tan
2017-08-09 1:22 ` [PATCH v2 13/25] pack: move get_size_from_delta() Jonathan Tan
2017-08-09 1:22 ` [PATCH v2 14/25] pack: move unpack_object_header() Jonathan Tan
2017-08-09 1:22 ` [PATCH v2 15/25] sha1_file: set whence in storage-specific info fn Jonathan Tan
2017-08-09 1:22 ` [PATCH v2 16/25] sha1_file: remove read_packed_sha1() Jonathan Tan
2017-08-09 1:22 ` [PATCH v2 17/25] pack: move packed_object_info(), unpack_entry() Jonathan Tan
2017-08-09 1:22 ` [PATCH v2 18/25] pack: move nth_packed_object_{sha1,oid} Jonathan Tan
2017-08-09 1:22 ` [PATCH v2 19/25] pack: move check_pack_index_ptr(), nth_packed_object_offset() Jonathan Tan
2017-08-09 1:22 ` [PATCH v2 20/25] pack: move find_pack_entry_one(), is_pack_valid() Jonathan Tan
2017-08-09 1:22 ` [PATCH v2 21/25] pack: move find_sha1_pack() Jonathan Tan
2017-08-09 1:22 ` [PATCH v2 22/25] pack: move find_pack_entry() and make it global Jonathan Tan
2017-08-09 1:22 ` [PATCH v2 23/25] pack: move has_sha1_pack() Jonathan Tan
2017-08-09 1:22 ` [PATCH v2 24/25] pack: move has_pack_index() Jonathan Tan
2017-08-09 1:22 ` [PATCH v2 25/25] pack: move for_each_packed_object() Jonathan Tan
2017-08-10 17:21 ` [PATCH v2 00/25] Move exported packfile funcs to its own file Stefan Beller
2017-08-10 21:19 ` Junio C Hamano
2017-08-10 21:59 ` Jonathan Tan
2017-08-10 22:40 ` Junio C Hamano [this message]
2017-08-11 20:36 ` [PATCH 0/2] non-move patches in preparation for packfile.c Jonathan Tan
2017-08-11 20:36 ` [PATCH 1/2] sha1_file: set whence in storage-specific info fn Jonathan Tan
2017-08-11 21:52 ` Junio C Hamano
2017-08-11 20:36 ` [PATCH 2/2] sha1_file: remove read_packed_sha1() Jonathan Tan
2017-08-11 22:06 ` Junio C Hamano
2017-08-11 19:41 ` [PATCH v2 00/25] Move exported packfile funcs to its own file Ben Peart
2017-08-18 23:36 ` Jonathan Tan
2017-08-18 22:20 ` [PATCH v3 00/23] " Jonathan Tan
2017-08-18 22:20 ` [PATCH v3 01/23] pack: move pack name-related functions Jonathan Tan
2017-08-18 22:20 ` [PATCH v3 02/23] pack: move static state variables Jonathan Tan
2017-08-18 22:20 ` [PATCH v3 03/23] pack: move pack_report() Jonathan Tan
2017-08-18 22:20 ` [PATCH v3 04/23] pack: move open_pack_index(), parse_pack_index() Jonathan Tan
2017-08-18 22:20 ` [PATCH v3 05/23] pack: move release_pack_memory() Jonathan Tan
2017-08-18 22:20 ` [PATCH v3 06/23] pack: move pack-closing functions Jonathan Tan
2017-08-18 22:20 ` [PATCH v3 07/23] pack: move use_pack() Jonathan Tan
2017-08-18 22:20 ` [PATCH v3 08/23] pack: move unuse_pack() Jonathan Tan
2017-08-18 22:20 ` [PATCH v3 09/23] pack: move add_packed_git() Jonathan Tan
2017-08-18 22:20 ` [PATCH v3 10/23] pack: move install_packed_git() Jonathan Tan
2017-08-18 22:20 ` [PATCH v3 11/23] pack: move {,re}prepare_packed_git and approximate_object_count Jonathan Tan
2017-08-18 22:20 ` [PATCH v3 12/23] pack: move unpack_object_header_buffer() Jonathan Tan
2017-08-18 22:20 ` [PATCH v3 13/23] pack: move get_size_from_delta() Jonathan Tan
2017-08-18 22:20 ` [PATCH v3 14/23] pack: move unpack_object_header() Jonathan Tan
2017-08-18 22:20 ` [PATCH v3 15/23] pack: move clear_delta_base_cache(), packed_object_info(), unpack_entry() Jonathan Tan
2017-08-18 22:20 ` [PATCH v3 16/23] pack: move nth_packed_object_{sha1,oid} Jonathan Tan
2017-08-18 22:20 ` [PATCH v3 17/23] pack: move check_pack_index_ptr(), nth_packed_object_offset() Jonathan Tan
2017-08-18 22:20 ` [PATCH v3 18/23] pack: move find_pack_entry_one(), is_pack_valid() Jonathan Tan
2017-08-18 22:20 ` [PATCH v3 19/23] pack: move find_sha1_pack() Jonathan Tan
2017-08-18 22:20 ` [PATCH v3 20/23] pack: move find_pack_entry() and make it global Jonathan Tan
2017-08-18 22:20 ` [PATCH v3 21/23] pack: move has_sha1_pack() Jonathan Tan
2017-08-18 22:20 ` [PATCH v3 22/23] pack: move has_pack_index() Jonathan Tan
2017-08-18 22:20 ` [PATCH v3 23/23] pack: move for_each_packed_object() Jonathan Tan
2017-08-19 7:33 ` [PATCH v3 00/23] Move exported packfile funcs to its own file Junio C Hamano
2017-08-20 6:40 ` Junio C Hamano
2017-08-21 18:40 ` Jonathan Tan
2017-08-21 22:55 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqfucz11yb.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=jonathantanmy@google$(echo .)com \
--cc=sbeller@google$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox