pack-objects: compute local/ignore_pack_keep early

diff --git a/wt-status.h b/wt-status.h
index b56ce3f0355f3a1e188c7d9bd44ea90f0d06d76f..2ca93f6957f69cd5652ddc764f5afe81b598a2a9 100644 (file)
--- a/wt-status.h
+++ b/wt-status.h
@@ -4,6 +4,9 @@
 #include <stdio.h>
 #include "string-list.h"
 #include "color.h"
+#include "pathspec.h"
+
+struct worktree;
 
 enum color_wt_status {
        WT_STATUS_HEADER = 0,
@@ -50,6 +53,7 @@ struct wt_status {
        enum commit_whence whence;
        int nowarn;
        int use_color;
+       int no_gettext;
        int display_comment_prefix;
        int relative_paths;
        int submodule_summary;
@@ -83,6 +87,7 @@ struct wt_status_state {
        int cherry_pick_in_progress;
        int bisect_in_progress;
        int revert_in_progress;
+       int detached_at;
        char *branch;
        char *onto;
        char *detached_from;
@@ -97,6 +102,10 @@ void wt_status_prepare(struct wt_status *s);
 void wt_status_print(struct wt_status *s);
 void wt_status_collect(struct wt_status *s);
 void wt_status_get_state(struct wt_status_state *state, int get_detached_from);
+int wt_status_check_rebase(const struct worktree *wt,
+                          struct wt_status_state *state);
+int wt_status_check_bisect(const struct worktree *wt,
+                          struct wt_status_state *state);
 
 void wt_shortstatus_print(struct wt_status *s);
 void wt_porcelain_print(struct wt_status *s);