Merge branch 'cb/ttk-style' of git-gui into cb/git-gui-ttk-style

diff --git a/wt-status.h b/wt-status.h
index fe27b465e220bb720dfd0b4d52ddeae74a942707..3f84d5c29ff270596a894e2d42843b03d7aa37c5 100644 (file)
--- a/wt-status.h
+++ b/wt-status.h
@@ -44,10 +44,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;
 };