mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-04 00:46:12 +02:00
Code

Ensure that the commit message is Windows formated (CRLF) before invoking the editor. 

(The default editor on Windows (Notepad) doesn't handle Unix line endings)

Signed-off-by: Marius Storm-Olsen <marius@trolltech.com>
This commit is contained in:
Marius Storm-Olsen 2007-06-07 14:07:01 +02:00 committed by Simon Hausmann
parent a52d5c7bc0
commit f7baba8b09
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
contrib/fast-import/git-p4
View File

@ -277,6 +277,7 @@ class P4Submit(Command):
self.directSubmit = False
self.trustMeLikeAFool = False
self.verbose = False
self.isWindows = (platform.system() == "Windows")
self.logSubstitutions = {}
self.logSubstitutions["<enter description here>"] = "%log%"
@ -398,6 +399,8 @@ class P4Submit(Command):
if not self.directSubmit:
logMessage = extractLogMessageFromGitCommit(id)
logMessage = logMessage.replace("\n", "\n\t")
if self.isWindows:
logMessage = logMessage.replace("\n", "\r\n")
logMessage = logMessage.strip()
template = read_pipe("p4 change -o")
@ -444,6 +447,8 @@ class P4Submit(Command):
tmpFile.close()
os.remove(fileName)
submitTemplate = message[:message.index(separatorLine)]
if self.isWindows:
submitTemplate = submitTemplate.replace("\r\n", "\n")
if response == "y" or response == "yes":
if self.dryRun: