From: Pete Wyckoff <pw@padd•com>
To: git@vger•kernel.org
Subject: [PATCH 01/21] git p4: temp branch name should use / even on windows
Date: Fri, 28 Sep 2012 08:04:05 -0400 [thread overview]
Message-ID: <1348833865-6093-2-git-send-email-pw@padd.com> (raw)
In-Reply-To: <1348833865-6093-1-git-send-email-pw@padd.com>
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.
Signed-off-by: Pete Wyckoff <pw@padd•com>
---
git-p4.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/git-p4.py b/git-p4.py
index 882b1bb..1e7a22a 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -2599,7 +2599,7 @@ class P4Sync(Command, P4UserMap):
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)
--
1.7.12.1.403.g28165e1
next prev parent reply other threads:[~2012-09-28 12:04 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-28 12:04 [PATCH 00/21] git p4: work on cygwin Pete Wyckoff
2012-09-28 12:04 ` Pete Wyckoff [this message]
2012-09-28 12:04 ` [PATCH 02/21] git p4: remove unused imports Pete Wyckoff
2012-09-28 12:04 ` [PATCH 03/21] git p4: generate better error message for bad depot path Pete Wyckoff
2012-09-28 18:58 ` Junio C Hamano
2012-09-28 12:04 ` [PATCH 04/21] git p4: fix error message when "describe -s" fails Pete Wyckoff
2012-09-28 19:02 ` Junio C Hamano
2012-09-28 12:04 ` [PATCH 05/21] git p4 test: use client_view to build the initial client Pete Wyckoff
2012-09-28 19:06 ` Junio C Hamano
2012-09-28 12:04 ` [PATCH 06/21] git p4 test: use client_view in t9806 Pete Wyckoff
2012-09-28 19:11 ` Junio C Hamano
2013-01-27 1:51 ` Pete Wyckoff
2012-09-28 12:04 ` [PATCH 07/21] git p4 test: start p4d inside its db dir Pete Wyckoff
2012-09-28 12:04 ` [PATCH 08/21] git p4 test: translate windows paths for cygwin Pete Wyckoff
2012-09-28 12:04 ` [PATCH 09/21] git p4: remove unreachable windows \r\n conversion code Pete Wyckoff
2012-09-28 12:04 ` [PATCH 10/21] git p4: scrub crlf for utf16 files on windows Pete Wyckoff
2012-09-28 12:04 ` [PATCH 11/21] git p4 test: newline handling Pete Wyckoff
2012-09-28 12:04 ` [PATCH 12/21] git p4 test: use LineEnd unix in windows tests too Pete Wyckoff
2012-09-28 12:04 ` [PATCH 13/21] git p4 test: avoid wildcard * in windows Pete Wyckoff
2012-09-28 12:04 ` [PATCH 14/21] git p4: cygwin p4 client does not mark read-only Pete Wyckoff
2012-09-28 12:04 ` [PATCH 15/21] git p4 test: disable chmod test for cygwin Pete Wyckoff
2012-09-28 19:33 ` Johannes Sixt
2012-09-28 12:04 ` [PATCH 16/21] git p4: disable read-only attribute before deleting Pete Wyckoff
2012-09-28 12:04 ` [PATCH 17/21] git p4: avoid shell when mapping users Pete Wyckoff
2012-09-28 12:04 ` [PATCH 18/21] git p4: avoid shell when invoking git rev-list Pete Wyckoff
2012-09-28 12:04 ` [PATCH 19/21] git p4: avoid shell when invoking git config --get-all Pete Wyckoff
2012-09-28 12:04 ` [PATCH 20/21] git p4: avoid shell when calling git config Pete Wyckoff
2012-09-28 12:04 ` [PATCH 21/21] git p4: introduce gitConfigBool Pete Wyckoff
2012-09-28 19:17 ` [PATCH 00/21] git p4: work on cygwin Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1348833865-6093-2-git-send-email-pw@padd.com \
--to=pw@padd$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox