[StGit PATCH] Fix some remaining old-style stg id calls
- From
Karl Hasselström <kha@treskal.com>
- Date
- Jul 25, 2008, 00:47 UTC
- Message-ID
- <20080725004430.12440.49829.stgit@yoghurt>
- In-Reply-To
- <20080713114047.18845.34899.stgit@localhost.localdomain>
Signed-off-by: Karl Hasselström <kha@treskal.com>
---
You'll want to add this (just squash it into your patch). The calls were failing, but since both sides produced the empty string on stdout, the test was happy anyway.
t/t1300-uncommit.sh | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/t/t1300-uncommit.sh b/t/t1300-uncommit.sh index a906d13..472baa4 100755 --- a/t/t1300-uncommit.sh +++ b/t/t1300-uncommit.sh @@ -42,7 +42,7 @@ test_expect_success \ 'Uncommit the patches using names' \ ' stg uncommit bar foo && - [ "$(stg id foo//top)" = "$(stg id bar//bottom)" ] && + [ "$(stg id foo)" = "$(stg id bar^)" ] && stg commit --all ' @@ -50,7 +50,7 @@ test_expect_success \ 'Uncommit the patches using prefix' \ ' stg uncommit --number=2 foobar && - [ "$(stg id foobar1//top)" = "$(stg id foobar2//bottom)" ] && + [ "$(stg id foobar1)" = "$(stg id foobar2^)" ] && stg commit --all ' @@ -58,7 +58,7 @@ test_expect_success \ 'Uncommit the patches using auto names' \ ' stg uncommit --number=2 && - [ "$(stg id foo-patch//top)" = "$(stg id bar-patch//bottom)" ] && + [ "$(stg id foo-patch)" = "$(stg id bar-patch^)" ] && stg commit --all ' @@ -67,14 +67,14 @@ test_expect_success \ ' stg uncommit && stg uncommit && - [ "$(stg id foo-patch//top)" = "$(stg id bar-patch//bottom)" ] && + [ "$(stg id foo-patch)" = "$(stg id bar-patch^)" ] && stg commit --all ' test_expect_success \ 'Uncommit the patches with --to' ' stg uncommit --to HEAD^ && - [ "$(stg id foo-patch//top)" = "$(stg id bar-patch//bottom)" ] && + [ "$(stg id foo-patch)" = "$(stg id bar-patch^)" ] && stg commit --all '