Commit | Line | Data |
---|---|---|
e0d32236 YD |
1 | #!/bin/sh |
2 | # | |
3 | # Copyright (c) 2007 Yann Dirson | |
4 | # | |
5 | ||
0209d767 | 6 | test_description='Excercise pull-policy "rebase".' |
e0d32236 YD |
7 | |
8 | . ./test-lib.sh | |
9 | ||
e0d32236 | 10 | test_expect_success \ |
0209d767 | 11 | 'Fork stack off parent branch, and add patches to the stack' \ |
e0d32236 | 12 | ' |
0209d767 | 13 | git branch -m master parent && |
05ec3711 | 14 | stg init && |
0209d767 | 15 | stg branch --create stack && |
dbb0cf2c PO |
16 | git config branch.stack.stgit.pull-policy rebase && |
17 | git config --list && | |
0209d767 YD |
18 | stg new c1 -m c1 && |
19 | echo a > file && stg add file && stg refresh | |
e0d32236 YD |
20 | ' |
21 | ||
e0d32236 | 22 | test_expect_success \ |
0209d767 | 23 | 'Add non-rewinding commit in parent and pull the stack' \ |
e0d32236 | 24 | ' |
0209d767 YD |
25 | stg branch parent && stg new u1 -m u1 && |
26 | echo b > file2 && stg add file2 && stg refresh && | |
27 | stg branch stack && stg pull && | |
28 | test -e file2 | |
e0d32236 YD |
29 | ' |
30 | ||
e0d32236 | 31 | test_expect_success \ |
0209d767 | 32 | 'Rewind/rewrite commit in parent and pull the stack' \ |
e0d32236 | 33 | ' |
0209d767 YD |
34 | stg branch parent && echo b >> file2 && stg refresh && |
35 | stg branch stack && stg pull && | |
36 | test `wc -l <file2` = 2 | |
e0d32236 YD |
37 | ' |
38 | ||
e0d32236 | 39 | test_done |