Remove unused argument from mergetool()
[stgit.git] / t / t1210-pull-check-upstream.sh
blob3f81ddcc60fd8f9ae4a93882461f49543b98f1d7
1 #!/bin/sh
3 test_description='Check that pulling works when no upstream is configured'
5 . ./test-lib.sh
7 # Need a repo to clone
8 test_create_repo upstream
10 test_expect_success \
11 'Setup upstream repo, clone it, and add patches to the clone' \
13 (cd upstream && stg init) &&
14 stg clone upstream clone &&
15 (cd clone && git config pull.rebase false)
18 test_expect_success \
19 'Test that pull works' \
21 (cd clone &&
22 git checkout master &&
23 stg pull
27 test_expect_success \
28 'Test that pull without upstream setup produces friendly error' \
30 (cd clone &&
31 stg branch --create without-upstream &&
32 command_error stg pull 2>out.txt &&
33 grep "There is no tracking information for the current branch" out.txt
37 test_done