From: Matt Arsenault Date: Sun, 21 Oct 2012 01:59:29 GMT Subject: [PATCH] Fix git p4 sync errors Message-ID: >From 425e4dc6992d07aa00039c5bb8e8c76def591fd3 Mon Sep 17 00:00:00 2001 From: Matt Arsenault Date: Sat, 20 Oct 2012 18:48:45 -0700 Subject: [PATCH] git-p4: Fix not using -s option to describe This solves errors in some cases when syncing renamed files. Other places where describe is used use the -s, except this one. Signed-off-by: Matt Arsenault --- git-p4.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-p4.py b/git-p4.py index 882b1bb..e203508 100755 --- a/git-p4.py +++ b/git-p4.py @@ -2543,7 +2543,7 @@ class P4Sync(Command, P4UserMap): def importChanges(self, changes): cnt = 1 for change in changes: - description = p4Cmd(["describe", str(change)]) + description = p4Cmd(["describe", "-s", str(change)]) self.updateOptionDict(description) if not self.silent: -- 1.7.12.2