GitLab

What steps will reproduce the problem?

1. Open up TortoiseGit - Settings.
2. Under "General", select "Dialogs 3".
3. Set "Char position where to show a border line in commit text boxes" to 72.
4. Open up TortoiseGit - Commit.
5. Type 74 characters in a repeating pattern, e.g. "123456789 " (note space at end)

What is the expected output? What do you see instead?

There should be a border line after 72 characters. However, the border line is shown after 74 characters instead.

Please see attached screenshot.

What version of TortoiseGit and Git are you using? On what operating system?

• TortoiseGit 1.8.16.0
• git version 2.6.2.windows.1
• Windows 10 64-bit, also repros in Windows 7 64-bit

Please provide any additional information below.

This problem appears to be caused by revision 6d2f0ce5 (17-Nov-2012) for issue #1252 (closed).

In src/TortoiseProc/ProjectProperties.cpp, the code is intentionally adding 2:

nLogWidthMarker = _ttoi(val) + 2; // HACK, + 2 needed 

The hack seems to be an attempt to work around a bug in automatic word-wrapping. You can see this by going back to a version of TortoiseGit from a year ago:

1. Install TortoiseGit 1.8.12.0 in a VM.
2. Set border to display at 72 characters.
3. Open TortoiseGit - Commit.
4. Enter 7 repetitions of "123456789 "
5. Type "x yz"
6. Notice that all of "x yz" gets moved to the next line. So it ends up wrapping after 70 characters instead of 72, even though it's displaying the line after 74 characters. The +2 didn't actually change the 70-character wrapping to 72.

Automatic word-wrapping is now off in TortoiseGit 1.8.16.0. I actually think this is better. If auto-wrapping is so buggy that it's not wrapping consistently, then it's better to display the border line and let the user wrap the commit message manually.

However, the hack is causing the border to be drawn in the wrong place. If the user wraps manually using the border as a guide, he now ends up with 2 extra characters.