This is a small set of patches to git-p4 to fix a couple of issues with branches and labels. This is the second version of this patch series; the first one vanished without trace :-) Firstly, I've added the fixes needed so that branches and labels can contain shell metacharacters (missed from the previous series). Added a test case for this. In adding the test case for labels I also found and fixed a few other small bugs in the label handling: - labels missing a description or "EOT" in their text cause problems; - labels without an owner cause problems. I also noticed, but did not fix, that you can't have more than one label per commit (the others are silently dropped) and the documentation for branch import could be improved. I've added a (failing) test case for the multiple label problem. Luke Diamand (4): 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 contrib/fast-import/git-p4 | 61 +++++++++++++----------- t/t9801-git-p4-branch.sh | 48 ++++++++++++++++++ t/t9804-git-p4-label.sh | 114 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 195 insertions(+), 28 deletions(-) create mode 100755 t/t9804-git-p4-label.sh -- 1.7.8.rc1.209.geac91.dirty -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html