From: Pete Wyckoff <pw@padd.com>
Date: Sun, 27 Jan 2013 03:11:04 +0000 (-0500)
Subject: git p4: temp branch name should use / even on windows
X-Git-Tag: v1.8.2-rc0~57^2~20
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/4f9273d27b399c9b6e0be372e607b9a8176c0699?ds=inline;hp=--cc

git p4: temp branch name should use / even on windows

Commit fed2369 (git-p4: Search for parent commit on branch creation,
2012-01-25) uses temporary branches to help find the parent of a
new p4 branch.  The temp branches are of the form "git-p4-tmp/%d"
for some p4 change number.  Mistakenly, this string was made
using os.path.join() instead of just string concatenation.  On
windows, this turns into a backslash (\), which is not allowed in
git branch names.

Reported-by: Casey McGinty <casey.mcginty@gmail.com>
Signed-off-by: Pete Wyckoff <pw@padd.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

4f9273d27b399c9b6e0be372e607b9a8176c0699
diff --git a/git-p4.py b/git-p4.py
index 2da564995d..fb77c56049 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -2687,7 +2687,7 @@ def importChanges(self, changes):
 
                         blob = None
                         if len(parent) > 0:
-                            tempBranch = os.path.join(self.tempBranchLocation, "%d" % (change))
+                            tempBranch = "%s/%d" % (self.tempBranchLocation, change)
                             if self.verbose:
                                 print "Creating temporary branch: " + tempBranch
                             self.commit(description, filesForCommit, tempBranch)