diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-04-30 14:58:16 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-04-30 14:58:16 -0700 |
| commit | 9768cafe681a7844d5a1d067991053b25db83bbb (patch) | |
| tree | 63c5c2aa6640d03d3db627166d4a3956f2dadb32 /t/t9800-git-p4-basic.sh | |
| parent | 1692579dd3569ebc01187872db91ee2ad93cc962 (diff) | |
| parent | 00855b656bf883c607a4adcd5bc7a76711e4b3a3 (diff) | |
| download | git-9768cafe681a7844d5a1d067991053b25db83bbb.tar.gz git-9768cafe681a7844d5a1d067991053b25db83bbb.tar.xz | |
Merge branch 'ld/git-p4-tags-and-labels'
By Luke Diamand
* ld/git-p4-tags-and-labels:
git p4: fix unit tests
git p4: move verbose to base class
git p4: Ignore P4EDITOR if it is empty
git p4: Squash P4EDITOR in test harness
git p4: fix-up "import/export of labels to/from p4"
git p4: import/export of labels to/from p4
git p4: Fixing script editor checks
Diffstat (limited to 't/t9800-git-p4-basic.sh')
| -rwxr-xr-x | t/t9800-git-p4-basic.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t9800-git-p4-basic.sh b/t/t9800-git-p4-basic.sh index 13be14445..b2f08697a 100755 --- a/t/t9800-git-p4-basic.sh +++ b/t/t9800-git-p4-basic.sh @@ -335,7 +335,7 @@ test_expect_success 'detect renames' ' test_when_finished cleanup_git && ( cd "$git" && - git config git-p4.skipSubmitEditCheck true && + git config git-p4.skipSubmitEdit true && git mv file1 file4 && git commit -a -m "Rename file1 to file4" && @@ -394,7 +394,7 @@ test_expect_success 'detect copies' ' test_when_finished cleanup_git && ( cd "$git" && - git config git-p4.skipSubmitEditCheck true && + git config git-p4.skipSubmitEdit true && cp file2 file8 && git add file8 && |