aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--builtin/rev-list.c15
1 files changed, 12 insertions, 3 deletions
diff --git a/builtin/rev-list.c b/builtin/rev-list.c
index 99f876ba85..3bf30e1467 100644
--- a/builtin/rev-list.c
+++ b/builtin/rev-list.c
@@ -88,9 +88,19 @@ static int arg_print_omitted; /* print objects omitted by filter */
struct missing_objects_map_entry {
struct oidmap_entry entry;
- const char *path;
+ char *path;
unsigned type;
};
+
+static void missing_objects_map_entry_free(void *e)
+{
+ struct missing_objects_map_entry *entry =
+ container_of(e, struct missing_objects_map_entry, entry);
+
+ free(entry->path);
+ free(entry);
+}
+
static struct oidmap missing_objects;
enum missing_action {
MA_ERROR = 0, /* fail if any missing objects are encountered */
@@ -935,10 +945,9 @@ int cmd_rev_list(int argc,
while ((entry = oidmap_iter_next(&iter))) {
print_missing_object(entry, arg_missing_action ==
MA_PRINT_INFO);
- free((void *)entry->path);
}
- oidmap_clear(&missing_objects, true);
+ oidmap_clear_with_free(&missing_objects, missing_objects_map_entry_free);
}
stop_progress(&progress);