kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

git-p4: make closeStreams() idempotent 

Ensure that we can safely call self.closeStreams() multiple times, and
can also call it even if there is no git fast-import stream at all.

Signed-off-by: Luke Diamand <luke@diamand.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Luke Diamand 2020-01-29 11:12:41 +00:00 committed by Junio C Hamano
parent c7a6207591
commit 837b3a6376
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
git-p4.py
View File

@ -3549,11 +3549,14 @@ class P4Sync(Command, P4UserMap):
self.gitError = self.importProcess.stderr self.gitError = self.importProcess.stderr


def closeStreams(self): def closeStreams(self):
if self.gitStream is None:
return
self.gitStream.close() self.gitStream.close()
if self.importProcess.wait() != 0: if self.importProcess.wait() != 0:
die("fast-import failed: %s" % self.gitError.read()) die("fast-import failed: %s" % self.gitError.read())
self.gitOutput.close() self.gitOutput.close()
self.gitError.close() self.gitError.close()
self.gitStream = None


def run(self, args): def run(self, args):
if self.importIntoRemotes: if self.importIntoRemotes: