From: Luke Diamand <luke@diamand.org>
To: git@vger.kernel.org
Cc: Vinicius Kursancew <viniciusalexandre@gmail.com>,
larsxschneider@gmail.com, Luke Diamand <luke@diamand.org>
Subject: [PATCHv1 1/2] git-p4: support git-workspaces
Date: Fri, 2 Dec 2016 22:43:18 +0000 [thread overview]
Message-ID: <20161202224319.5385-2-luke@diamand.org> (raw)
In-Reply-To: <20161202224319.5385-1-luke@diamand.org>
Teach git-p4 about git-workspaces.
Signed-off-by: Luke Diamand <luke@diamand.org>
---
git-p4.py | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/git-p4.py b/git-p4.py
index 0c4f2afd2..5e2db1919 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -566,6 +566,12 @@ def isValidGitDir(path):
if (os.path.exists(path + "/HEAD")
and os.path.exists(path + "/refs") and os.path.exists(path + "/objects")):
return True;
+
+ # git workspace directory?
+ if (os.path.exists(path + "/HEAD")
+ and os.path.exists(path + "/gitdir")):
+ return True
+
return False
def parseRevision(ref):
--
2.11.0.274.g0ea315c
next prev parent reply other threads:[~2016-12-02 22:43 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-02 22:43 [PATCHv1 0/2] git-p4 patches Luke Diamand
2016-12-02 22:43 ` Luke Diamand [this message]
2016-12-05 20:53 ` [PATCHv1 1/2] git-p4: support git-workspaces Junio C Hamano
2016-12-05 21:13 ` Luke Diamand
2016-12-05 21:24 ` Junio C Hamano
2016-12-05 21:54 ` Junio C Hamano
2016-12-05 21:55 ` Luke Diamand
2016-12-05 23:17 ` Junio C Hamano
2016-12-02 22:43 ` [PATCHv1 2/2] git-p4: support updating an existing shelved changelist Luke Diamand
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=20161202224319.5385-2-luke@diamand.org \
--to=luke@diamand.org \
--cc=git@vger.kernel.org \
--cc=larsxschneider@gmail.com \
--cc=viniciusalexandre@gmail.com \
/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).