| commit | fbf640b1179717cd4aaeb83c551e6629cc6127b5 | |
| author | Thomas Wolf <thomas.wolf@paranor.ch> | |
| Fri, 18 Mar 2022 23:24:02 +0000 (19 00:24 +0100) | ||
| committer | Thomas Wolf <thomas.wolf@paranor.ch> | |
| Fri, 18 Mar 2022 23:41:07 +0000 (19 00:41 +0100) | ||
| tree | f13bf2a6f39f431721f56f3985864eb1cc4539d7 | treesnapshot (tar.gz zip) |
| parent | daa12362b5e06a229e1a5496f3ffb577b158fe54 | commitdiff |
[squash] Ensure message is cleaned even if dialog is canceled
Return VERBATIM only if the dialog was not canceled. In that case,
the dialog already cleaned the message. But if it is canceled, return
the original CleanupMode and let JGit clean the message.
Note that a squash currently cannot be aborted. Canceling the dialog
only cancels editing the commit message. This is bug 451817.
Change-Id: If8e3f06787ae1322f0da0b8ebaa7347fd488bb0c
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
Return VERBATIM only if the dialog was not canceled. In that case,
the dialog already cleaned the message. But if it is canceled, return
the original CleanupMode and let JGit clean the message.
Note that a squash currently cannot be aborted. Canceling the dialog
only cancels editing the commit message. This is bug 451817.
Change-Id: If8e3f06787ae1322f0da0b8ebaa7347fd488bb0c
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>