From: Luke Diamand <luke@diamand.org>
Date: Tue, 19 Jun 2018 08:04:11 +0000 (+0100)
Subject: git-p4: python3: fix octal constants
X-Git-Tag: v2.19.0-rc0~163^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=db2d997efa43596fe5860d1b1c0c410e99d96f67;p=thirdparty%2Fgit.git

git-p4: python3: fix octal constants

See PEP3127. Works fine with python2 as well.

Signed-off-by: Luke Diamand <luke@diamand.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/git-p4.py b/git-p4.py
index 714e442d7c..b449db1cc9 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -1841,7 +1841,7 @@ class P4Submit(Command, P4UserMap):
                     filesToDelete.remove(path)
 
                 dst_mode = int(diff['dst_mode'], 8)
-                if dst_mode == 0120000:
+                if dst_mode == 0o120000:
                     symlinks.add(path)
 
             elif modifier == "D":