X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/751c890baeb20118bcdea0b735c85995b7f588fa..5ab0897e67b0203470690a11885b61ca1cb4ab8a:/t/t2102-pull-policy-rebase.sh diff --git a/t/t2102-pull-policy-rebase.sh b/t/t2102-pull-policy-rebase.sh index ce2e32f..5619bda 100755 --- a/t/t2102-pull-policy-rebase.sh +++ b/t/t2102-pull-policy-rebase.sh @@ -13,17 +13,17 @@ test_expect_success \ git branch -m master parent && stg init && stg branch --create stack && - git repo-config branch.stack.stgit.pull-policy rebase && - git repo-config --list && + git config branch.stack.stgit.pull-policy rebase && + git config --list && stg new c1 -m c1 && - echo a > file && stg add file && stg refresh + echo a > file && git add file && stg refresh ' test_expect_success \ 'Add non-rewinding commit in parent and pull the stack' \ ' stg branch parent && stg new u1 -m u1 && - echo b > file2 && stg add file2 && stg refresh && + echo b > file2 && git add file2 && stg refresh && stg branch stack && stg pull && test -e file2 '