'Cherry-pick' commits after combined commits when combine is done

[tortoisegit/TortoiseGitJp.git] / src / Git / GitFolderStatus.h

diff --git a/src/Git/GitFolderStatus.h b/src/Git/GitFolderStatus.h
index dba9f4f..646d7f3 100644 (file)
--- a/src/Git/GitFolderStatus.h
+++ b/src/Git/GitFolderStatus.h
@@ -78,7 +78,7 @@ typedef struct FileStatusCacheEntry
        const char*                             url;            ///< points to a (possibly) shared value\r
        const char*                             owner;          ///< points to a (possible) lock owner\r
        bool                                    needslock;\r
        const char*                             url;            ///< points to a (possibly) shared value\r
        const char*                             owner;          ///< points to a (possible) lock owner\r
        bool                                    needslock;\r

-       //git_revnum_t                  rev;\r
+       git_revnum_t                    rev;\r

        int                                             askedcounter;\r
        //git_lock_t *                  lock;\r
        bool                                    tree_conflict;\r
        int                                             askedcounter;\r
        //git_lock_t *                  lock;\r
        bool                                    tree_conflict;\r


@@ -117,7 +117,8 @@ private:
        DWORD                           GetTimeoutValue();\r
        //static git_error_t*   fillstatusmap (void *baton, const char *path, git_wc_status2_t *status, apr_pool_t *pool);\r
        //static git_error_t*   findfolderstatus (void *baton, const char *path, git_wc_status2_t *status, apr_pool_t *pool);\r
        DWORD                           GetTimeoutValue();\r
        //static git_error_t*   fillstatusmap (void *baton, const char *path, git_wc_status2_t *status, apr_pool_t *pool);\r
        //static git_error_t*   findfolderstatus (void *baton, const char *path, git_wc_status2_t *status, apr_pool_t *pool);\r

-       static void                     fillstatusmap(CString &path,git_wc_status_kind status,void *pdata);\r
+       static BOOL                     fillstatusmap(const struct wgFile_s *pFile, void *pUserData);\r
+       static void                     fillstatusmap_idx(CString &path,git_wc_status_kind status,void *pdata);\r

 \r
        static CTGitPath        folderpath;\r
        void                            ClearCache();\r
 \r
        static CTGitPath        folderpath;\r
        void                            ClearCache();\r