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 -- 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