diff options
| author | Luke Diamand <luke@diamand.org> | 2012-04-11 17:21:24 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-04-24 14:17:39 -0700 |
| commit | c8942a223d41adab336946913f28cf8691ee479a (patch) | |
| tree | 97d34e6eecfb69dd36ea1cd7add9438671106888 /t | |
| parent | 06804c76e8f7a61c7c9473decdf9b210d3238e9d (diff) | |
| download | git-c8942a223d41adab336946913f28cf8691ee479a.tar.gz | |
git p4: fix-up "import/export of labels to/from p4"
The previous one is already in 'next' but was somewhat lacking.
The configuration "git-p4.validLabelRegexp" is now called
"labelExportRegexp", and its default covers lowercase alphabets as
well.
Signed-off-by: Luke Diamand <luke@diamand.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t9811-git-p4-label-import.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t9811-git-p4-label-import.sh b/t/t9811-git-p4-label-import.sh index 85d60494bf..fb00ffab24 100755 --- a/t/t9811-git-p4-label-import.sh +++ b/t/t9811-git-p4-label-import.sh @@ -30,7 +30,7 @@ test_expect_success 'basic p4 labels' ' p4 tag -l TAG_F1_ONLY main/f1 && p4 tag -l TAG_WITH\$_SHELL_CHAR main/... && - p4 tag -l this_tag_will_be_skipped main/... && + p4 tag -l this_tag_will_be\ skipped main/... && echo f4 >main/f4 && p4 add main/f4 && @@ -50,7 +50,7 @@ test_expect_success 'basic p4 labels' ' git p4 clone --dest="$git" //depot@all && cd "$git" && - git config git-p4.validLabelRegexp ".*TAG.*" && + git config git-p4.labelImportRegexp ".*TAG.*" && git p4 sync --import-labels --verbose && git tag && |