X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/ea5b7bf3533205be4268d8e7d79198344161c819..5fd79c5f5aa2ea962162260e88f274983cb1e032:/t/t2102-pull-policy-rebase.sh diff --git a/t/t2102-pull-policy-rebase.sh b/t/t2102-pull-policy-rebase.sh index 135b48c..952ee7e 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 && git add file && stg refresh + echo a > file && stg 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 && git add file2 && stg refresh && + echo b > file2 && stg add file2 && stg refresh && stg branch stack && stg pull && test -e file2 '