-
Bug
-
Resolution: Fixed
-
Critical
-
None
-
Pretested Integration Plugin 2.2.3
Windows
From a customer we got the following report about failed merge, due to quotation marks in the git commit message.
Example (customer specific information removed)
07:28:45 [ready2master] $ git.exe pull origin master
07:28:51 Preparing to merge changes in commit 1b395e86024bf8f5d6cad09953d8c70f94987b98 to integration branch master
07:28:52 [PREINT] git.exe merge -m "Accumulated commit of the following from branch 'origin/ready/my-dev':
07:28:52
07:28:52 commit 1b395e86024bf8f5d6cad09953d8c70f94987b98
07:28:52 Author: Praqma Support <support@praqma.net>
07:28:52 Date: on maj 13 07:26:39 2015 +0200
07:28:52
07:28:52 Changes scons varible test to "build=rel or test"
07:28:52
07:28:52
07:28:52 " 1b395e86024bf8f5d6cad09953d8c70f94987b98 --no-ff
07:28:52 [ready2master] $ git.exe merge -m 'Accumulated commit of the following from branch 'origin/ready/my-dev':
07:28:52
07:28:52 commit 1b395e86024bf8f5d6cad09953d8c70f94987b98
07:28:52 Author: Praqma Support <support@praqma.net>
07:28:52 Date: on maj 13 07:26:39 2015 +0200
07:28:52
07:28:52 Changes scons varible test to "build=rel or test"
07:28:52
07:28:52
07:28:52 ' 1b395e86024bf8f5d6cad09953d8c70f94987b98 --no-ff
07:28:52 Failed to merge changes.
07:28:52 merge: or - not something we can merge
07:28:52
07:28:52 Merge failure