From: Luke Diamand <luke@diamand.org>
To: git@vger.kernel.org
Cc: Pete Wyckoff <pw@padd.com>, Vitor Antunes <vitor.hda@gmail.com>,
Luke Diamand <luke@diamand.org>
Subject: [PATCHv4 0/5] git-p4: small fixes to branches and labels
Date: Thu, 19 Jan 2012 09:52:24 +0000 [thread overview]
Message-ID: <1326966749-9077-1-git-send-email-luke@diamand.org> (raw)
This is the fourth version of some small fixes to git-p4 branch and
label handling, incorporating a fix from Pete Wyckoff and an
additional failing test.
This change does not fix the other problems with git-p4 labels:
- two p4 labels on the same changelist will fall over
- labels must match exactly the list of files imported
- you can't import a label without a p4 commit
Luke Diamand (5):
git-p4: handle p4 branches and labels containing shell chars
git-p4: cope with labels with empty descriptions
git-p4: importing labels should cope with missing owner
git-p4: add test for p4 labels
git-p4: label import fails with multiple labels at the same
changelist
contrib/fast-import/git-p4 | 79 ++++++++++++++-----------
t/t9803-git-p4-shell-metachars.sh | 48 ++++++++++++++++
t/t9804-git-p4-label.sh | 113 +++++++++++++++++++++++++++++++++++++
3 files changed, 205 insertions(+), 35 deletions(-)
create mode 100755 t/t9804-git-p4-label.sh
--
1.7.8.rc1.209.geac91.dirty
next reply other threads:[~2012-01-19 9:52 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-19 9:52 Luke Diamand [this message]
2012-01-19 9:52 ` [PATCHv4 1/5] git-p4: handle p4 branches and labels containing shell chars Luke Diamand
2012-01-19 9:52 ` [PATCHv4 2/5] git-p4: cope with labels with empty descriptions Luke Diamand
2012-01-19 9:52 ` [PATCHv4 3/5] git-p4: importing labels should cope with missing owner Luke Diamand
2012-01-19 9:52 ` [PATCHv4 4/5] git-p4: add test for p4 labels Luke Diamand
2012-01-19 9:52 ` [PATCHv4 5/5] git-p4: label import fails with multiple labels at the same changelist Luke Diamand
2012-01-19 15:19 ` [PATCHv4 0/5] git-p4: small fixes to branches and labels 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=1326966749-9077-1-git-send-email-luke@diamand.org \
--to=luke@diamand.org \
--cc=git@vger.kernel.org \
--cc=pw@padd.com \
--cc=vitor.hda@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).