From: Junio C Hamano <gitster@pobox.com>
To: David Turner <dturner@twopensource.com>
Cc: git@vger.kernel.org, mhagger@alum.mit.edu,
David Turner <dturner@twitter.com>
Subject: Re: [PATCH 20/43] refs-be-files.c: add methods for the ref iterators
Date: Fri, 25 Sep 2015 13:54:59 -0700 [thread overview]
Message-ID: <xmqqeghm2p98.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <1441245313-11907-21-git-send-email-dturner@twopensource.com> (David Turner's message of "Wed, 2 Sep 2015 21:54:50 -0400")
Up to high-teens in this 43 patch series, the changes all looked
"separate filesystem backend specific part from refs.c to
refs-be-files.c" without other questionable changes, but I have to
give up at this step for now, as conflicts between the patch and the
current codebase is getting a bit too much to manually adjust the
patch only to make sure there is no funnies other than a straight
rename of static functions going on.
We seem to have added a few more iterators in refs.c that would need
to be also wrapped as methods, so this step would need to be redone.
Regarding [03/43], it is a straight rename without any content
change, so you probably could have done "format-patch -M". But that
original commit, if I am not mistaken, left an empty ref.c instead
of removing, which was somewhat funny (and Makefile still expects
refs.o can be produced from refs.c).
The other side of the same coin is that [04/43] expects an empty
refs.c to be in the original; it should be creating a new file
instead.
Just for future reference to others, what I did was:
* looked at the gzipped patch and made sure the preimage of refs.c
and the postimage of refs-be-files.c were identical.
* started from the tip of current master, merged the topics
mentioned in the message with the gzipped patch to it, and called
the result $BASE0.
* applied 01/43 and 02/43 on $BASE0.
* then manually moved refs.c to refs-be-files.c and told git about
them, and applied changes to Makefile in 03/43, and committed the
result.
* adjusted 04/43 to expect refs.c to be missing and applied it.
* continued to apply from 05/43 thru until I get a conflict that
I feel uncomfortable to adjust myself.
* "git format-patch --stdout -M $BASE0.. >./+dt0".
* Pick 'next', 'jch' and 'pu' as the starting point, attempted to
run "git am ./+dt0" (with success). At least, by adjusting for
03/43 and 04/43 and recording 03/43 as a rename in "./+dt0", the
early parts of these attempts were survivable ;-). Then
attempted to apply 20/43 on top of the result, all of which
unfortunately left a conflict that I feel uncomfortable to adjust
myself.
Thanks.
next prev parent reply other threads:[~2015-09-25 20:55 UTC|newest]
Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-03 1:54 [PATCH 00/43] refs lmdb backend David Turner
2015-09-03 1:54 ` [PATCH 01/43] refs.c: create a public version of verify_refname_available David Turner
2015-09-03 23:08 ` Junio C Hamano
2015-09-04 15:45 ` David Turner
2015-09-03 1:54 ` [PATCH 02/43] refs: make repack_without_refs and is_branch public David Turner
2015-09-03 1:54 ` [PATCH 04/43] refs.c: add a new refs.c file to hold all common refs code David Turner
2015-09-03 1:54 ` [PATCH 05/43] refs.c: move update_ref to refs.c David Turner
2015-09-03 1:54 ` [PATCH 06/43] refs.c: move delete_ref and delete_refs to the common code David Turner
2015-09-03 1:54 ` [PATCH 07/43] refs.c: move read_ref_at to the common refs file David Turner
2015-09-03 1:54 ` [PATCH 08/43] refs.c: move the hidden refs functions to the common code David Turner
2015-09-03 1:54 ` [PATCH 09/43] refs.c: move dwim and friend functions to the common refs code David Turner
2015-09-03 1:54 ` [PATCH 10/43] refs.c: move warn_if_dangling_symref* to the common code David Turner
2015-09-03 1:54 ` [PATCH 11/43] refs.c: move read_ref, read_ref_full and ref_exists " David Turner
2015-09-03 1:54 ` [PATCH 12/43] refs.c: move resolve_refdup to common David Turner
2015-09-03 1:54 ` [PATCH 13/43] refs.c: move check_refname_format to the common code David Turner
2015-09-03 1:54 ` [PATCH 14/43] refs.c: move is_branch " David Turner
2015-09-03 1:54 ` [PATCH 15/43] refs.c: move prettify_refname " David Turner
2015-09-03 1:54 ` [PATCH 16/43] refs.c: move ref iterators " David Turner
2015-09-03 1:54 ` [PATCH 17/43] refs.c: move head_ref_namespaced " David Turner
2015-09-03 1:54 ` [PATCH 18/43] refs-be-files.c: add a backend method structure with transaction functions David Turner
2015-09-03 1:54 ` [PATCH 19/43] refs-be-files.c: add methods for misc ref operations David Turner
2015-09-03 1:54 ` [PATCH 20/43] refs-be-files.c: add methods for the ref iterators David Turner
2015-09-25 20:54 ` Junio C Hamano [this message]
2015-09-25 21:28 ` David Turner
2015-09-25 21:33 ` Junio C Hamano
2015-09-03 1:54 ` [PATCH 21/43] refs-be-files.c: add method for for_each_reftype_ David Turner
2015-09-03 1:54 ` [PATCH 22/43] refs-be-files.c: add do_for_each_per_worktree_ref David Turner
2015-09-03 1:54 ` [PATCH 23/43] refs.c: move refname_is_safe to the common code David Turner
2015-09-03 1:54 ` [PATCH 24/43] refs.h: document make refname_is_safe and add it to header David Turner
2015-09-03 2:06 ` David Turner
2015-09-03 1:54 ` [PATCH 25/43] refs.c: move copy_msg to the common code David Turner
2015-09-03 1:54 ` [PATCH 26/43] refs.c: move peel_object " David Turner
2015-09-03 1:54 ` [PATCH 27/43] refs.c: move should_autocreate_reflog to " David Turner
2015-09-03 1:54 ` [PATCH 28/43] refs.c: add ref backend init function David Turner
2015-09-03 1:54 ` [PATCH 29/43] refs.c: add methods for reflog David Turner
2015-09-03 1:55 ` [PATCH 30/43] refs.c: add method for initial ref transaction commit David Turner
2015-09-03 1:55 ` [PATCH 31/43] initdb: move safe_create_dir into common code David Turner
2015-09-03 1:55 ` [PATCH 32/43] refs.c: add method for initializing refs db David Turner
2015-09-03 1:55 ` [PATCH 33/43] refs.c: make struct ref_transaction generic David Turner
2015-09-03 1:55 ` [PATCH 34/43] refs-be-files.c: add method to rename refs David Turner
2015-09-03 1:55 ` [PATCH 35/43] refs-be-files.c: add method to expire reflogs David Turner
2015-09-03 1:55 ` [PATCH 36/43] run-command: track total number of commands run David Turner
2015-09-03 1:55 ` [PATCH 37/43] refs: move some defines from refs-be-files.c to refs.h David Turner
2015-09-03 1:55 ` [PATCH 38/43] refs: make some files backend functions public David Turner
2015-09-03 1:55 ` [PATCH 39/43] refs: break out a ref conflict check David Turner
2015-09-03 1:55 ` [PATCH 40/43] refs: allow ref backend to be set for clone David Turner
2015-09-03 1:55 ` [PATCH 41/43] refs: add register_refs_backend David Turner
2015-09-03 1:55 ` [PATCH 42/43] refs: add LMDB refs backend David Turner
2015-09-03 23:16 ` Junio C Hamano
2015-09-03 1:55 ` [PATCH 43/43] refs: tests for db backend David Turner
2015-09-03 23:10 ` [PATCH 00/43] refs lmdb backend Junio C Hamano
2015-09-04 16:01 ` David Turner
2015-09-17 0:09 ` David Turner
2015-09-17 16:33 ` 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=xmqqeghm2p98.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=dturner@twitter.com \
--cc=dturner@twopensource.com \
--cc=git@vger.kernel.org \
--cc=mhagger@alum.mit.edu \
/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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.