threads / patch / 24010

patchAdd the option to not sync after a submitting to Perforce.

Subject: [PATCH] Add the option to not sync after a submitting to Perforce.

## tl;dr

One message between Jun 4, 2010 and Jun 4, 2010. Diffs are folded; open one to read it.

replies: 0people: 1as markdown or json

Benjamin C Meyer· Jun 4, 2010, 17:33 UTC · lore

When p4->git syncing occurs not on the users machine, but on a central mirror server there is no local remote. When a user performs a 'git p4 submit' in this configuration after successfully applying the patches the p4 submit command will then output a failure because it could not p4 sync. This causes users to think their submit failed when in fact it was successful.

Signed-off-by: Benjamin C Meyer <bmeyer@rim.com>
---
 contrib/fast-import/git-p4 |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
Show changes to contrib/fast-import/git-p4 +3 −0
diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index d42b865..2a9771b 100755
--- a/contrib/fast-import/git-p4
+++ b/contrib/fast-import/git-p4
@@ -823,6 +823,9 @@ class P4Submit(Command):
             print "All changes applied!"
             chdir(self.oldWorkingDirectory)
 
+            if gitConfig("git-p4.syncAfterSubmit") == "false":
+                return True
+
             sync = P4Sync()
             sync.run([])
 
-- 
1.7.1

← back to recent threads