wt-status.c: handle worktree renames

diff --git a/wt-status.h b/wt-status.h
index 6018c627b1e40e5c36d0c0c12eff1f262cb439b4..e87ee2de656b09d53563da4fb7e7aae7ec7b2f05 100644 (file)
--- a/wt-status.h
+++ b/wt-status.h
@@ -38,10 +38,11 @@ struct wt_status_change_data {
        int worktree_status;
        int index_status;
        int stagemask;
-       int score;
        int mode_head, mode_index, mode_worktree;
        struct object_id oid_head, oid_index;
-       char *head_path;
+       int rename_status;
+       int rename_score;
+       char *rename_source;
        unsigned dirty_submodule       : 2;
        unsigned new_submodule_commits : 1;
 };
@@ -112,7 +113,7 @@ struct wt_status_state {
        unsigned char cherry_pick_head_sha1[20];
 };
 
-void wt_status_truncate_message_at_cut_line(struct strbuf *);
+size_t wt_status_locate_end(const char *s, size_t len);
 void wt_status_add_cut_line(FILE *fp);
 void wt_status_prepare(struct wt_status *s);
 void wt_status_print(struct wt_status *s);