Merge branch 'dc/p4-binary-submit-fix'

Prevent "git p4" from failing to submit changes to binary file.

* dc/p4-binary-submit-fix:
  git-p4: fix failed submit by skip non-text data files
This commit is contained in:
Junio C Hamano 2021-07-13 16:52:52 -07:00
commit b6bd704c3e

View File

@ -1977,8 +1977,11 @@ class P4Submit(Command, P4UserMap):
newdiff += "+%s\n" % os.readlink(newFile)
else:
f = open(newFile, "r")
for line in f.readlines():
newdiff += "+" + line
try:
for line in f.readlines():
newdiff += "+" + line
except UnicodeDecodeError:
pass # Found non-text data and skip, since diff description should only include text
f.close()
return (diff + newdiff).replace('\r\n', '\n')