Thanks for the feedback; here is a re-roll. A number of points
discussed on the mailing list were fixed. The main change, in patch
17, is how repack_without_ref() deals with references that cannot be
peeled when re-writing the packed-refs file:
if ISBROKEN:
emit an error and omit reference from the output
else if !has_sha1_file(...):
if there is an overriding loose reference:
silently omit reference from the output
else:
emit an error and omit reference from the output
Please note that this creates a relatively harmless race condition
very similar to the ones discussed for pack-refs; see the commit
message for patch 17 for a long explanation. I would like to fix all
of the races as part of a separate patch series.
For now I left the sleeps in t3210. Given that the problem will be
solved by topic jc/prune-all, building a fancier workaround into this
test for the old broken --expire behavior seems like a waste of time.
I propose that the sleeps be removed when this patch series is merged
with jc/prune-all. (In fact, when jc/prune-all is landed, other tests
can also be simplified.) If this suggestion is not ok, then the
easiest thing would probably be to remove the sleeps immediately and
declare jc/prune-all a prerequisite of this series.
I also removed the trailing comma from the "enum peel_status"
definition, because a recent email on the mailing list claimed that
some compilers don't like them.
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 | 733 +++++++++++++++++++++++++++++++++++++++------------
refs.h | 35 +++
t/t3210-pack-refs.sh | 36 +++
t/t3211-peel-ref.sh | 9 +
9 files changed, 643 insertions(+), 341 deletions(-)
delete mode 100644 pack-refs.c
delete mode 100644 pack-refs.h
--
1.8.2.1
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html