git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH 01/21] git p4: temp branch name should use / even on windows

From
PWPete Wyckoff <pw@padd.com>
Date
Sep 28, 2012, 12:04 UTC
Message-ID
<1348833865-6093-2-git-send-email-pw@padd.com>
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
Previous: Pete WyckoffNext: Pete Wyckoff
Message 2 of 29 in “git p4: work on cygwin”
  1. 00/21 git p4: work on cygwinPete Wyckoff, Sep 28, 2012
  2. 01/21 git p4: temp branch name should use / even on windowsPete Wyckoff, Sep 28, 2012
  3. 02/21 git p4: remove unused importsPete Wyckoff, Sep 28, 2012
  4. 03/21 git p4: generate better error message for bad depot pathPete Wyckoff, Sep 28, 2012
  5. Junio C HamanoSep 28, 2012
  6. 04/21 git p4: fix error message when "describe -s" failsPete Wyckoff, Sep 28, 2012
  7. Junio C HamanoSep 28, 2012
  8. 05/21 git p4 test: use client_view to build the initial clientPete Wyckoff, Sep 28, 2012
  9. Junio C HamanoSep 28, 2012
  10. 06/21 git p4 test: use client_view in t9806Pete Wyckoff, Sep 28, 2012
  11. Junio C HamanoSep 28, 2012
  12. Pete WyckoffJan 27, 2013
  13. 07/21 git p4 test: start p4d inside its db dirPete Wyckoff, Sep 28, 2012
  14. 08/21 git p4 test: translate windows paths for cygwinPete Wyckoff, Sep 28, 2012
  15. 09/21 git p4: remove unreachable windows \r\n conversion codePete Wyckoff, Sep 28, 2012
  16. 10/21 git p4: scrub crlf for utf16 files on windowsPete Wyckoff, Sep 28, 2012
  17. 11/21 git p4 test: newline handlingPete Wyckoff, Sep 28, 2012
  18. 12/21 git p4 test: use LineEnd unix in windows tests tooPete Wyckoff, Sep 28, 2012
  19. 13/21 git p4 test: avoid wildcard * in windowsPete Wyckoff, Sep 28, 2012
  20. 14/21 git p4: cygwin p4 client does not mark read-onlyPete Wyckoff, Sep 28, 2012
  21. 15/21 git p4 test: disable chmod test for cygwinPete Wyckoff, Sep 28, 2012
  22. Johannes SixtSep 28, 2012
  23. 16/21 git p4: disable read-only attribute before deletingPete Wyckoff, Sep 28, 2012
  24. 17/21 git p4: avoid shell when mapping usersPete Wyckoff, Sep 28, 2012
  25. 18/21 git p4: avoid shell when invoking git rev-listPete Wyckoff, Sep 28, 2012
  26. 19/21 git p4: avoid shell when invoking git config --get-allPete Wyckoff, Sep 28, 2012
  27. 20/21 git p4: avoid shell when calling git configPete Wyckoff, Sep 28, 2012
  28. 21/21 git p4: introduce gitConfigBoolPete Wyckoff, Sep 28, 2012
  29. Junio C HamanoSep 28, 2012

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.