From: Michael Haggerty <mhagger@alum.mit.edu>
To: Junio C Hamano <gitster@pobox.com>, Jeff King <peff@peff.net>,
Heiko Voigt <hvoigt@hvoigt.net>
Cc: git@vger.kernel.org, Michael Haggerty <mhagger@alum.mit.edu>
Subject: [PATCH 00/33] Various cleanups around reference packing and peeling
Date: Sun, 14 Apr 2013 14:54:15 +0200 [thread overview]
Message-ID: <1365944088-10588-1-git-send-email-mhagger@alum.mit.edu> (raw)
The highlight of this patch series are that (1) peeled references are
not lost from the packed-refs file when a packed reference is deleted
and (2) there is more code sharing between the code used by "git
packed-refs" and the code used by repack_without_ref() for deleting a
packed reference. Along the way I have added a lot of documentation
and fixed several smaller bugs.
I had to add some sleeps in test t3210 but I hope that somebody can
find a way to eliminate them.
The last patch implements a change that I brushed off a long time ago
when Heiko suggested it. He was right (probably not for performance
reasons, but because it simplifies the code).
Summary:
Patches 1-4 document existing code.
Patches 5-6 random cleanup.
Patches 7-9 change the semantics of get_packed_ref() to make it more
reusable and change other locations to use this function.
Patch 10 extracts a function ref_resolves_to_object().
Patches 11-14 unify reference-peeling in two new functions,
peel_object() and peel_entry() (and fix an inconsistency in
peel_ref()).
Patch 15 introduces a new internal reference-iteration API and adjusts
some internal code to use it. The new API gives the callback function
direct access to the ref_entry. This corrects the handling of
current_ref during an iteration over only packed references.
Patches 16-17 add and fix a test of a spurious error message.
Patches 18-22 change the reference-deleting code to write peeled refs
to the packed-refs file. (Previously, whenever a packed reference was
deleted, all of the peeled values were lost when the packed-refs file
was rewritten.)
Patches 23-31 move the code from pack-refs.{c,h} into refs.{c,h},
adjust it to its new surroundings, and change it to share some code
with repack_without_ref().
Patches 32-33 simplify access to the main reference cache.
Michael Haggerty (33):
refs: document flags constants REF_*
refs: document the fields of struct ref_value
refs: document do_for_each_ref() and do_one_ref()
refs: document how current_ref is used
refs: define constant PEELED_LINE_LENGTH
do_for_each_ref_in_dirs(): remove dead code
get_packed_ref(): return a ref_entry
peel_ref(): use function get_packed_ref()
repack_without_ref(): use function get_packed_ref()
refs: extract a function ref_resolves_to_object()
refs: extract function peel_object()
peel_object(): give more specific information in return value
peel_ref(): fix return value for non-peelable, not-current reference
refs: extract a function peel_entry()
refs: change the internal reference-iteration API
t3210: test for spurious error messages for dangling packed refs
repack_without_ref(): silence errors for dangling packed refs
search_ref_dir(): return an index rather than a pointer
refs: change how packed refs are deleted
t3211: demonstrate loss of peeled refs if a packed ref is deleted
repack_without_ref(): write peeled refs in the rewritten file
refs: extract a function write_packed_entry()
pack-refs: rename handle_one_ref() to pack_one_ref()
pack-refs: merge code from pack-refs.{c,h} into refs.{c,h}
pack_one_ref(): rename "path" parameter to "refname"
refs: use same lock_file object for both ref-packing functions
pack_refs(): change to use do_for_each_entry()
refs: inline function do_not_prune()
pack_one_ref(): use function peel_entry()
pack_one_ref(): use write_packed_entry() to do the writing
pack_one_ref(): do some cheap tests before a more expensive one
refs: change do_for_each_*() functions to take ref_cache arguments
refs: handle the main ref_cache specially
Makefile | 2 -
builtin/clone.c | 1 -
builtin/pack-refs.c | 2 +-
pack-refs.c | 148 -----------
pack-refs.h | 18 --
refs.c | 699 ++++++++++++++++++++++++++++++++++++++-------------
refs.h | 35 +++
t/t3210-pack-refs.sh | 36 +++
t/t3211-peel-ref.sh | 9 +
9 files changed, 609 insertions(+), 341 deletions(-)
delete mode 100644 pack-refs.c
delete mode 100644 pack-refs.h
--
1.8.2.1
next reply other threads:[~2013-04-14 12:55 UTC|newest]
Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-14 12:54 Michael Haggerty [this message]
2013-04-14 12:54 ` [PATCH 01/33] refs: document flags constants REF_* Michael Haggerty
2013-04-14 12:54 ` [PATCH 02/33] refs: document the fields of struct ref_value Michael Haggerty
2013-04-14 12:54 ` [PATCH 03/33] refs: document do_for_each_ref() and do_one_ref() Michael Haggerty
2013-04-15 17:38 ` Junio C Hamano
2013-04-16 9:11 ` Michael Haggerty
2013-04-14 12:54 ` [PATCH 04/33] refs: document how current_ref is used Michael Haggerty
2013-04-14 12:54 ` [PATCH 05/33] refs: define constant PEELED_LINE_LENGTH Michael Haggerty
2013-04-14 12:54 ` [PATCH 06/33] do_for_each_ref_in_dirs(): remove dead code Michael Haggerty
2013-04-14 12:54 ` [PATCH 07/33] get_packed_ref(): return a ref_entry Michael Haggerty
2013-04-14 12:54 ` [PATCH 08/33] peel_ref(): use function get_packed_ref() Michael Haggerty
2013-04-14 12:54 ` [PATCH 09/33] repack_without_ref(): " Michael Haggerty
2013-04-14 12:54 ` [PATCH 10/33] refs: extract a function ref_resolves_to_object() Michael Haggerty
2013-04-15 16:51 ` Junio C Hamano
2013-04-16 9:27 ` Michael Haggerty
2013-04-16 18:08 ` Junio C Hamano
2013-04-14 12:54 ` [PATCH 11/33] refs: extract function peel_object() Michael Haggerty
2013-04-14 12:54 ` [PATCH 12/33] peel_object(): give more specific information in return value Michael Haggerty
2013-04-15 17:38 ` Junio C Hamano
2013-04-14 12:54 ` [PATCH 13/33] peel_ref(): fix return value for non-peelable, not-current reference Michael Haggerty
2013-04-15 17:38 ` Junio C Hamano
2013-04-16 9:38 ` Michael Haggerty
2013-04-14 12:54 ` [PATCH 14/33] refs: extract a function peel_entry() Michael Haggerty
2013-04-15 17:38 ` Junio C Hamano
2013-04-16 13:07 ` Michael Haggerty
2013-04-16 17:55 ` Junio C Hamano
2013-04-16 22:01 ` Michael Haggerty
2013-04-14 12:54 ` [PATCH 15/33] refs: change the internal reference-iteration API Michael Haggerty
2013-04-15 17:38 ` Junio C Hamano
2013-04-16 13:27 ` Michael Haggerty
2013-04-16 17:47 ` Junio C Hamano
2013-04-14 12:54 ` [PATCH 16/33] t3210: test for spurious error messages for dangling packed refs Michael Haggerty
2013-04-15 17:39 ` Junio C Hamano
2013-04-16 14:14 ` Michael Haggerty
2013-04-16 23:22 ` Junio C Hamano
2013-04-16 23:57 ` Jeff King
2013-04-17 4:42 ` Junio C Hamano
2013-04-17 22:38 ` Junio C Hamano
2013-04-18 7:46 ` [PATCH 0/2] Add documentation for new expiry option values Michael Haggerty
2013-04-18 7:46 ` [PATCH 1/2] git-gc.txt, git-reflog.txt: document new expiry options Michael Haggerty
2013-04-18 7:46 ` [PATCH 2/2] api-parse-options.txt: document "no-" for non-boolean options Michael Haggerty
2013-04-25 18:13 ` [PATCH] prune: introduce OPT_EXPIRY_DATE() and use it Junio C Hamano
2013-04-17 8:11 ` [PATCH 16/33] t3210: test for spurious error messages for dangling packed refs Michael Haggerty
2013-04-14 12:54 ` [PATCH 17/33] repack_without_ref(): silence errors " Michael Haggerty
2013-04-15 17:39 ` Junio C Hamano
2013-04-17 8:41 ` Michael Haggerty
2013-04-14 12:54 ` [PATCH 18/33] search_ref_dir(): return an index rather than a pointer Michael Haggerty
2013-04-14 12:54 ` [PATCH 19/33] refs: change how packed refs are deleted Michael Haggerty
2013-04-14 12:54 ` [PATCH 20/33] t3211: demonstrate loss of peeled refs if a packed ref is deleted Michael Haggerty
2013-04-14 12:54 ` [PATCH 21/33] repack_without_ref(): write peeled refs in the rewritten file Michael Haggerty
2013-04-15 17:39 ` Junio C Hamano
2013-04-14 12:54 ` [PATCH 22/33] refs: extract a function write_packed_entry() Michael Haggerty
2013-04-14 12:54 ` [PATCH 23/33] pack-refs: rename handle_one_ref() to pack_one_ref() Michael Haggerty
2013-04-14 12:54 ` [PATCH 24/33] pack-refs: merge code from pack-refs.{c,h} into refs.{c,h} Michael Haggerty
2013-04-14 12:54 ` [PATCH 25/33] pack_one_ref(): rename "path" parameter to "refname" Michael Haggerty
2013-04-14 12:54 ` [PATCH 26/33] refs: use same lock_file object for both ref-packing functions Michael Haggerty
2013-04-14 12:54 ` [PATCH 27/33] pack_refs(): change to use do_for_each_entry() Michael Haggerty
2013-04-14 12:54 ` [PATCH 28/33] refs: inline function do_not_prune() Michael Haggerty
2013-04-14 12:54 ` [PATCH 29/33] pack_one_ref(): use function peel_entry() Michael Haggerty
2013-04-14 12:54 ` [PATCH 30/33] pack_one_ref(): use write_packed_entry() to do the writing Michael Haggerty
2013-04-14 12:54 ` [PATCH 31/33] pack_one_ref(): do some cheap tests before a more expensive one Michael Haggerty
2013-04-14 12:54 ` [PATCH 32/33] refs: change do_for_each_*() functions to take ref_cache arguments Michael Haggerty
2013-04-15 17:40 ` Junio C Hamano
2013-04-14 12:54 ` [PATCH 33/33] refs: handle the main ref_cache specially Michael Haggerty
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=1365944088-10588-1-git-send-email-mhagger@alum.mit.edu \
--to=mhagger@alum.mit.edu \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=hvoigt@hvoigt.net \
--cc=peff@peff.net \
/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 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 NNTP newsgroup(s).