8bff5ca030
We had several C files ignoring the rule to include one of the appropriate headers first; fix that. While at it, the rule in Documentation/CodingGuidelines about which header to include has also fallen out of sync, so update the wording to mention other allowed headers. Unfortunately, C files in reftable/ don't actually follow the previous or updated rule. If you follow the #include chain in its C files, reftable/system.h _tends_ to be first (i.e. record.c first includes record.h, which first includes basics.h, which first includees system.h), but not always (e.g. publicbasics.c includes another header first that does not include system.h). However, I'm going to punt on making actual changes to the C files in reftable/ since I do not want to risk bringing it out-of-sync with any version being used externally. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
45 lines
988 B
C
45 lines
988 B
C
#include "git-compat-util.h"
|
|
#include "object-store.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);
|
|
}
|