Squash rebase fills message too much
By fresv... on June 15, 2013 21:40 (imported from Google Code)
What steps will reproduce the problem?
- Open the dialog for rebase.
- Pick every second commit and squash every second commit.
- Do the rebase.
What is the expected output? What do you see instead?
The log messages are merges for the commits that are squashed and the log message editor opens. The problem is that if there is only one non-squash commit in between the squashed commits, the log message will not be cleaned. In the example above, the proposed message will just increase instead of holding the last two messages only.
The attached image has a green box around the expected log message. The red ellipses shows that too many log messages are merged.
What version of TortoiseGit and msysgit are you using? On
what operating system?
TortoiseGit 1.8.3.0 (x64)
git version 1.8.1.msysgit.1
Windows 7 x64
Please provide any additional information below.
I have attached a patch that solves this problem, but I'm not sure if it introduce some other problem instead.
