Skip to content

Commit 2f1ef15

Browse files
committed
Merge branch 'mh/packed-refs-various'
Update reading and updating packed-refs file, correcting corner case bugs. * mh/packed-refs-various: (33 commits) refs: handle the main ref_cache specially refs: change do_for_each_*() functions to take ref_cache arguments pack_one_ref(): do some cheap tests before a more expensive one pack_one_ref(): use write_packed_entry() to do the writing pack_one_ref(): use function peel_entry() refs: inline function do_not_prune() pack_refs(): change to use do_for_each_entry() refs: use same lock_file object for both ref-packing functions pack_one_ref(): rename "path" parameter to "refname" pack-refs: merge code from pack-refs.{c,h} into refs.{c,h} pack-refs: rename handle_one_ref() to pack_one_ref() refs: extract a function write_packed_entry() repack_without_ref(): write peeled refs in the rewritten file t3211: demonstrate loss of peeled refs if a packed ref is deleted refs: change how packed refs are deleted search_ref_dir(): return an index rather than a pointer repack_without_ref(): silence errors for dangling packed refs t3210: test for spurious error messages for dangling packed refs refs: change the internal reference-iteration API refs: extract a function peel_entry() ...
2 parents c51afbb + 9da31cb commit 2f1ef15

File tree

9 files changed

+640
-341
lines changed

9 files changed

+640
-341
lines changed

Makefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -685,7 +685,6 @@ LIB_H += notes-cache.h
685685
LIB_H += notes-merge.h
686686
LIB_H += notes.h
687687
LIB_H += object.h
688-
LIB_H += pack-refs.h
689688
LIB_H += pack-revindex.h
690689
LIB_H += pack.h
691690
LIB_H += parse-options.h
@@ -818,7 +817,6 @@ LIB_OBJS += notes-cache.o
818817
LIB_OBJS += notes-merge.o
819818
LIB_OBJS += object.o
820819
LIB_OBJS += pack-check.o
821-
LIB_OBJS += pack-refs.o
822820
LIB_OBJS += pack-revindex.o
823821
LIB_OBJS += pack-write.o
824822
LIB_OBJS += pager.o

builtin/clone.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
#include "transport.h"
1919
#include "strbuf.h"
2020
#include "dir.h"
21-
#include "pack-refs.h"
2221
#include "sigchain.h"
2322
#include "branch.h"
2423
#include "remote.h"

builtin/pack-refs.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include "builtin.h"
22
#include "parse-options.h"
3-
#include "pack-refs.h"
3+
#include "refs.h"
44

55
static char const * const pack_refs_usage[] = {
66
N_("git pack-refs [options]"),

pack-refs.c

Lines changed: 0 additions & 148 deletions
This file was deleted.

pack-refs.h

Lines changed: 0 additions & 18 deletions
This file was deleted.

0 commit comments

Comments
 (0)