mirror of
https://github.com/git/git
synced 2024-10-30 03:39:13 +00:00
a034e9106f
The vast majority of files including object-store.h did not need dir.h
nor khash.h. Split the header into two files, and let most just depend
upon object-store-ll.h, while letting the two callers that need it
depend on the full object-store.h.
After this patch:
$ git grep -h include..object-store | sort | uniq -c
2 #include "object-store.h"
129 #include "object-store-ll.h"
Diff best viewed with `--color-moved`.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
46 lines
1 KiB
C
46 lines
1 KiB
C
#include "git-compat-util.h"
|
|
#include "environment.h"
|
|
#include "gettext.h"
|
|
#include "object-store-ll.h"
|
|
#include "packfile.h"
|
|
#include "progress.h"
|
|
#include "prune-packed.h"
|
|
|
|
static struct progress *progress;
|
|
|
|
static int prune_subdir(unsigned int nr, const char *path, void *data)
|
|
{
|
|
int *opts = data;
|
|
display_progress(progress, nr + 1);
|
|
if (!(*opts & PRUNE_PACKED_DRY_RUN))
|
|
rmdir(path);
|
|
return 0;
|
|
}
|
|
|
|
static int prune_object(const struct object_id *oid, const char *path,
|
|
void *data)
|
|
{
|
|
int *opts = data;
|
|
|
|
if (!has_object_pack(oid))
|
|
return 0;
|
|
|
|
if (*opts & PRUNE_PACKED_DRY_RUN)
|
|
printf("rm -f %s\n", path);
|
|
else
|
|
unlink_or_warn(path);
|
|
return 0;
|
|
}
|
|
|
|
void prune_packed_objects(int opts)
|
|
{
|
|
if (opts & PRUNE_PACKED_VERBOSE)
|
|
progress = start_delayed_progress(_("Removing duplicate objects"), 256);
|
|
|
|
for_each_loose_file_in_objdir(get_object_directory(),
|
|
prune_object, NULL, prune_subdir, &opts);
|
|
|
|
/* Ensure we show 100% before finishing progress */
|
|
display_progress(progress, 256);
|
|
stop_progress(&progress);
|
|
}
|