From: Matt Arsenault <arsenm2@gmail.com>
To: git@vger.kernel.org
Subject: [PATCH] Fix git p4 sync errors
Date: Sat, 20 Oct 2012 18:59:29 -0700 [thread overview]
Message-ID: <AC43C2B4-623F-4590-9F92-6CCA26645EFE@gmail.com> (raw)
>From 425e4dc6992d07aa00039c5bb8e8c76def591fd3 Mon Sep 17 00:00:00 2001
From: Matt Arsenault <arsenm2@gmail.com>
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 <arsenm2@gmail.com>
---
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
next reply other threads:[~2012-10-21 1:59 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-21 1:59 Matt Arsenault [this message]
2012-10-21 19:06 ` [PATCH] Fix git p4 sync errors Junio C Hamano
2012-10-25 2:41 ` Matt Arsenault
2012-10-26 15:44 ` Christian Couder
2012-10-28 15:06 ` Pete Wyckoff
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=AC43C2B4-623F-4590-9F92-6CCA26645EFE@gmail.com \
--to=arsenm2@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).