Submodule Diff Dialog might display wrong submodule revision

By p.pien... on September 10, 2012 09:22 (imported from Google Code)

---

What steps will reproduce the problem?

1. Use attached repo on Test.zip
2. Showlog-> use rebase from branch 'master2' -> 'master' (Rebase master2 onto this ...)
3. While rebasing got conflict on file 'test.txt'
4. Then I resolved conflict on file test.txt and Commit changes
5. After rebase submodule is on wrong commit. Should be on "61c12b" but he is on "718e36". In conflict windows submodule have status 'Modified', so IWhat steps will reproduce the problem?
6. Use attached repo on Test.zip
7. Showlog-> use rebase from branch 'master2' -> 'master' (Rebase master2 onto this ...)
8. While rebasing got conflict on file 'test.txt'
9. Then I resolved conflict on file test.txt and Commit changes
10. After rebase submodule is on wrong commit. Should be on "61c12b" but he is on "718e36". In conflict windows submodule have status 'Modified', so Is mean that I do not need to check this submodule

Additional information:
This situation occurs only when we have conflict while rebase. When we have rebase without conflic submoudle behave correctly. Automatically goes to "61c12b" commit.

What version of TortoiseGit and msysgit are you using? On
what operating system?
Win7
TortoiseGit 1.7.12.0
git version 1.7.11.msysgit.0 (C:\Program Files (x86)\Git\bin)

Please provide any additional information below.

---

Test.zip