From 91b4651cda7c340ba55fd02f80f0eaf2b6208f2e Mon Sep 17 00:00:00 2001 From: Frank Li Date: Wed, 2 Mar 2011 13:45:11 +0800 Subject: [PATCH] Fixed issue #735: Log generates file stats from shown parent instead of actual parent Issue happen only when there are only commit at log and filtered by path. log -- path. There is only 1 commit. tortoisegit use the wrong way to check parent number. This patch fixed this problem Signed-off-by: Frank Li --- ext/libgit2 | 2 +- src/Changelog.txt | 4 +++- src/Git/GitRev.cpp | 4 +++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ext/libgit2 b/ext/libgit2 index 5d773a6ee..729818ef2 160000 --- a/ext/libgit2 +++ b/ext/libgit2 @@ -1 +1 @@ -Subproject commit 5d773a6ee8542a5eaf94c34efcd27124c78e0bc7 +Subproject commit 729818ef24c4ff773477f050003342e2fa922309 diff --git a/src/Changelog.txt b/src/Changelog.txt index 9c8f187b7..c3c57a1e4 100644 --- a/src/Changelog.txt +++ b/src/Changelog.txt @@ -19,7 +19,9 @@ * Make change setting "hide TGit menu" work * Fixed issue #729: SVN DCommitt incorrectly executes with --rmdir * Fixed issue #732: Synch-dialog layout broken - * Fixed issue #734: git not found: Fixed possible problems with folders containing spaces + * Fixed issue #734: git not found: Fixed possible problems with folders containing spaces + * Fixed issue #735: Log generates file stats from shown parent instead of actual parent + = Release 1.6.5.0 = == Bug Fix == diff --git a/src/Git/GitRev.cpp b/src/Git/GitRev.cpp index ee856f12d..2f471dc9d 100644 --- a/src/Git/GitRev.cpp +++ b/src/Git/GitRev.cpp @@ -241,8 +241,10 @@ int GitRev::SafeFetchFullInfo(CGit *git) return -1; int i=0; - bool isRoot = this->m_ParentHash.size()==0; + git_get_commit_first_parent(&commit,&list); + bool isRoot = (list==NULL); + while(git_get_commit_next_parent(&list,parent) == 0 || isRoot) { GIT_FILE file=0; -- 2.11.4.GIT