blob: 3417138a80989620519ac7c8bb48055fd0bdbf50 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
|
#!/bin/sh
test_description='git rebase --abort tests'
. ./test-lib.sh
test_expect_success setup '
echo a > a &&
git add a &&
git commit -m a &&
git branch to-rebase &&
echo b > a &&
git commit -a -m b &&
echo c > a &&
git commit -a -m c &&
git checkout to-rebase &&
echo d > a &&
git commit -a -m "merge should fail on this" &&
echo e > a &&
git commit -a -m "merge should fail on this, too" &&
git branch pre-rebase
'
test_expect_success 'rebase --abort' '
test_must_fail git rebase master &&
git rebase --abort &&
test $(git rev-parse to-rebase) = $(git rev-parse pre-rebase)
'
test_expect_success 'rebase --abort after --skip' '
# Clean up the state from the previous one
git reset --hard pre-rebase
rm -rf .dotest
test_must_fail git rebase master &&
test_must_fail git rebase --skip &&
test $(git rev-parse HEAD) = $(git rev-parse master) &&
git rebase --abort &&
test $(git rev-parse to-rebase) = $(git rev-parse pre-rebase)
'
test_expect_success 'rebase --abort after --continue' '
# Clean up the state from the previous one
git reset --hard pre-rebase
rm -rf .dotest
test_must_fail git rebase master &&
echo c > a &&
echo d >> a &&
git add a &&
test_must_fail git rebase --continue &&
test $(git rev-parse HEAD) != $(git rev-parse master) &&
git rebase --abort &&
test $(git rev-parse to-rebase) = $(git rev-parse pre-rebase)
'
test_done
|
