summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Diamand <luke@diamand.org>2012-04-25 08:16:54 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-04-25 15:19:26 (GMT)
commit00855b656bf883c607a4adcd5bc7a76711e4b3a3 (patch)
treece61ead201227851454d76c42be965bb9a37d682
parent6a10b6aa1e7b9bb114e525edb67b7650b46f333e (diff)
downloadgit-00855b656bf883c607a4adcd5bc7a76711e4b3a3.zip
git-00855b656bf883c607a4adcd5bc7a76711e4b3a3.tar.gz
git-00855b656bf883c607a4adcd5bc7a76711e4b3a3.tar.bz2
git p4: fix unit tests
The submit-edit tests relied on P4EDITOR being unset. Set it explicitly to an empty string. Signed-off-by: Luke Diamand <luke@diamand.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xt/t9805-git-p4-skip-submit-edit.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t9805-git-p4-skip-submit-edit.sh b/t/t9805-git-p4-skip-submit-edit.sh
index 4a72f79..353dcfb 100755
--- a/t/t9805-git-p4-skip-submit-edit.sh
+++ b/t/t9805-git-p4-skip-submit-edit.sh
@@ -91,7 +91,7 @@ test_expect_success 'no config, edited' '
cd "$git" &&
echo line >>file1 &&
git commit -a -m "change 5" &&
- EDITOR="\"$ed\"" git p4 submit &&
+ P4EDITOR="" EDITOR="\"$ed\"" git p4 submit &&
p4 changes //depot/... >wc &&
test_line_count = 5 wc
)