-
Bug
-
Resolution: Fixed
-
Medium
-
None
-
None
When using Stash with Git 2.0.3, the commit list shows the correct message for each commit. However, picking a commit from the list shows the commit message from the commit before that commit.
*This is a bug in Git 2.0.2 and 2.0.3.* This is not an issue in Stash, and cannot be corrected by Stash. The only solution is to downgrade Git to 2.0.1 or previous.
Git output from 2.0.3:
bturner@ubuntu:~/tmp/default-repository$ /opt/git/2.0.3/bin/git rev-list -1 --format="commit %H%n%H%x02%h%x02%P%x02%p%x02%aN%x02%aE%x02%at%n%B%n%x03" --stdin -- 0a943a29376f2336b78312d99e65da17048951db commit 0a943a29376f2336b78312d99e65da17048951db commit 0a943a29376f2336b78312d99e65da17048951db 0a943a29376f2336b78312d99e65da17048951db0a943a2e0a3f6d8c804c375f49d7609328111e8dc75a4bce0a3f6dAnna Buttfieldabuttfield@cascade.sydney.atlassian.com1296709267 Copy C.zip as D.zip bturner@ubuntu:~/tmp/default-repository$ /opt/git/2.0.3/bin/git diff-tree --no-renames --always --format="commit %H%n%H%x02%h%x02%P%x02%p%x02%aN%x02%aE%x02%at%n%B%n%x03" --root --stdin -- 0a943a29376f2336b78312d99e65da17048951db commit 0a943a29376f2336b78312d99e65da17048951db 0a943a29376f2336b78312d99e65da17048951db0a943a29376f2336b78312d99e65da17048951dbe0a3f6d8c804c375f49d7609328111e8dc75a4bce0a3f6d8c804c375f49d7609328111e8dc75a4bcAnna Buttfieldabuttfield@cascade.sydney.atlassian.com1296709220 Add binary file C.zip :040000 040000 d018ba56fd26ff91e87c10d2424993594f1240e5 f79fda8638b00cf1f457f7f516b2981ea9e74305 M binary
Output from Git 2.0.2, manifesting the same issue:
bturner@ubuntu:~/tmp/default-repository$ /opt/git/2.0.2/bin/git rev-list -1 --format="commit %H%n%H%x02%h%x02%P%x02%p%x02%aN%x02%aE%x02%at%n%B%n%x03" --stdin -- 0a943a29376f2336b78312d99e65da17048951db commit 0a943a29376f2336b78312d99e65da17048951db commit 0a943a29376f2336b78312d99e65da17048951db 0a943a29376f2336b78312d99e65da17048951db0a943a2e0a3f6d8c804c375f49d7609328111e8dc75a4bce0a3f6dAnna Buttfieldabuttfield@cascade.sydney.atlassian.com1296709267 Copy C.zip as D.zip bturner@ubuntu:~/tmp/default-repository$ /opt/git/2.0.2/bin/git diff-tree --no-renames --always --format="commit %H%n%H%x02%h%x02%P%x02%p%x02%aN%x02%aE%x02%at%n%B%n%x03" --root --stdin -- 0a943a29376f2336b78312d99e65da17048951db commit 0a943a29376f2336b78312d99e65da17048951db 0a943a29376f2336b78312d99e65da17048951db0a943a29376f2336b78312d99e65da17048951dbe0a3f6d8c804c375f49d7609328111e8dc75a4bce0a3f6d8c804c375f49d7609328111e8dc75a4bcAnna Buttfieldabuttfield@cascade.sydney.atlassian.com1296709220 Add binary file C.zip :040000 040000 d018ba56fd26ff91e87c10d2424993594f1240e5 f79fda8638b00cf1f457f7f516b2981ea9e74305 M binary
Output from Git 2.0.1, no issue:
bturner@ubuntu:~/tmp/default-repository$ /opt/git/2.0.1/bin/git rev-list -1 --format="commit %H%n%H%x02%h%x02%P%x02%p%x02%aN%x02%aE%x02%at%n%B%n%x03" --stdin -- 0a943a29376f2336b78312d99e65da17048951db commit 0a943a29376f2336b78312d99e65da17048951db commit 0a943a29376f2336b78312d99e65da17048951db 0a943a29376f2336b78312d99e65da17048951db0a943a2e0a3f6d8c804c375f49d7609328111e8dc75a4bce0a3f6dAnna Buttfieldabuttfield@cascade.sydney.atlassian.com1296709267 Copy C.zip as D.zip bturner@ubuntu:~/tmp/default-repository$ /opt/git/2.0.1/bin/git diff-tree --no-renames --always --format="commit %H%n%H%x02%h%x02%P%x02%p%x02%aN%x02%aE%x02%at%n%B%n%x03" --root --stdin -- 0a943a29376f2336b78312d99e65da17048951db commit 0a943a29376f2336b78312d99e65da17048951db 0a943a29376f2336b78312d99e65da17048951db0a943a29376f2336b78312d99e65da17048951dbe0a3f6d8c804c375f49d7609328111e8dc75a4bce0a3f6d8c804c375f49d7609328111e8dc75a4bcAnna Buttfieldabuttfield@cascade.sydney.atlassian.com1296709267 Copy C.zip as D.zip :040000 040000 d018ba56fd26ff91e87c10d2424993594f1240e5 f79fda8638b00cf1f457f7f516b2981ea9e74305 M binary
- mentioned in
-
![[Atlassian Documentation] Page](/images/icons/generic_link_16.png "[Atlassian Documentation] Page")
Page
No Confluence page found with the given URL.
-
Page
No Confluence page found with the given URL.
-
Page
No Confluence page found with the given URL.
-
Page Loading...
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
![[Atlassian Documentation] Page](https://confluence.atlassian.com/images/icons/favicon.png "[Atlassian Documentation] Page"){kind=icon}
[BSERV-5052] Commit messages are wrong when using Git 2.0.2 and 2.0.3
jason83 - I hope the omission didn't cause you too much trouble. I've added a note that Git 2.0.2/2.0.3 have been blacklisted to the upgrade guide. Thanks for pointing that out.
Although I appreciate the desire to only show correct data in Stash, it would have been nice to see the blacklisting of specific git versions mentioned in the upgrade guide for 3.2.0 (as it was for Stash 2.12 for example).
Well, at least I now know I wasn't going crazy the other day when I thought I saw the wrong commit messages, haha.
Thanks,
jasonrm
All,
Stash 3.0.7, 3.1.4 and 3.2.0 now include a hard check which will lock the system when started on Git 2.0.2 or 2.0.3, in addition to 1.8.4.3 (STASH-4101). The intention of this check is to prevent others from running into this behavior without explanation.
Junio has applied fixes which will be included in Git 2.0.4 and 2.1.0 to address this issue, as well as another issue discovered in 2.1.0-rc0.
Best regards,
Bryan Turner
Atlassian Stash
I've reported this issue on the git mailing list. The thread can be viewed in Nabble.
Git 2.0.4 (fixing this) is out.