From 2ac49695d699a49f70bc2a899889d723797c6e12 Mon Sep 17 00:00:00 2001 From: Yann Dirson Date: Wed, 3 May 2006 20:34:18 +0100 Subject: [PATCH] Fixes to the pull testcases. As mentionned earlier, the original testcases do not take --merged into account. Let's expect the push to fail without it, and succeed with it. Signed-off-by: Yann Dirson --- t/t1201-pull-trailing.sh | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/t/t1201-pull-trailing.sh b/t/t1201-pull-trailing.sh index 142f894..e5fac88 100755 --- a/t/t1201-pull-trailing.sh +++ b/t/t1201-pull-trailing.sh @@ -35,8 +35,20 @@ test_expect_success \ " test_expect_success \ + 'Pull those patches applied upstream, without pushing' \ + "(cd bar && stg pull --nopush + ) +" + +test_expect_failure \ + 'Try to push those patches without merge detection' \ + "(cd bar && stg push --all + ) +" + +test_expect_success \ 'Pull those patches applied upstream' \ - "(cd bar && stg pull + "(cd bar && stg push --all --merged ) " -- 2.11.0