Merge branch 'en/merge-options-ff-and-friends'

diff --git a/packfile.h b/packfile.h
index 81e868d55a9b1f1aeaafa4925a72ae5c53af86e9..fc7904ec8147004cdcec5f013a7bace27c8697ed 100644 (file)
--- a/packfile.h
+++ b/packfile.h
@@ -95,6 +95,13 @@ void unuse_pack(struct pack_window **);
 void clear_delta_base_cache(void);
 struct packed_git *add_packed_git(const char *path, size_t path_len, int local);
 
+/*
+ * Unlink the .pack and associated extension files.
+ * Does not unlink if 'force_delete' is false and the pack-file is
+ * marked as ".keep".
+ */
+void unlink_pack_path(const char *pack_name, int force_delete);
+
 /*
  * Make sure that a pointer access into an mmap'd index file is within bounds,
  * and can provide at least 8 bytes of data.