subtree: improve decision on merges kept in split

diff --git a/wt-status.h b/wt-status.h
index ea2456daf24a4a74b3d85b041527ce5f99dc2695..1673d146fa2f1e15eabccd1c6b12d0e74b5f0870 100644 (file)
--- a/wt-status.h
+++ b/wt-status.h
@@ -89,7 +89,9 @@ struct wt_status {
        int show_stash;
        int hints;
        enum ahead_behind_flags ahead_behind_flags;
-
+       int detect_rename;
+       int rename_score;
+       int rename_limit;
        enum wt_status_format status_format;
        unsigned char sha1_commit[GIT_MAX_RAWSZ]; /* when not Initial */
 
@@ -118,9 +120,9 @@ struct wt_status_state {
        char *branch;
        char *onto;
        char *detached_from;
-       unsigned char detached_sha1[20];
-       unsigned char revert_head_sha1[20];
-       unsigned char cherry_pick_head_sha1[20];
+       struct object_id detached_oid;
+       struct object_id revert_head_oid;
+       struct object_id cherry_pick_head_oid;
 };
 
 size_t wt_status_locate_end(const char *s, size_t len);