summaryrefslogtreecommitdiff
path: root/t/t3419-rebase-patch-id.sh
blob: 1f32faa4a4db3d0307365af0c9cbd5bf58ff964f (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
60
61
62
63
64
65
66
67
68
69
70
71
#!/bin/sh
 
test_description='git rebase - test patch id computation'
 
. ./test-lib.sh
 
scramble () {
	i=0
	while read x
	do
		if test $i -ne 0
		then
			echo "$x"
		fi
		i=$((($i+1) % 10))
	done <"$1" >"$1.new"
	mv -f "$1.new" "$1"
}
 
test_expect_success 'setup' '
	git commit --allow-empty -m initial &&
	git tag root
'
 
test_expect_success 'setup: 500 lines' '
	rm -f .gitattributes &&
	git checkout -q -f master &&
	git reset --hard root &&
	test_seq 500 >file &&
	git add file &&
	git commit -q -m initial &&
	git branch -f other &&
 
	scramble file &&
	git add file &&
	git commit -q -m "change big file" &&
 
	git checkout -q other &&
	: >newfile &&
	git add newfile &&
	git commit -q -m "add small file" &&
 
	git cherry-pick master >/dev/null 2>&1
'
 
test_expect_success 'setup attributes' '
	echo "file binary" >.gitattributes
'
 
test_expect_success 'detect upstream patch' '
	git checkout -q master &&
	scramble file &&
	git add file &&
	git commit -q -m "change big file again" &&
	git checkout -q other^{} &&
	git rebase master &&
	git rev-list master...HEAD~ >revs &&
	test_must_be_empty revs
'
 
test_expect_success 'do not drop patch' '
	git branch -f squashed master &&
	git checkout -q -f squashed &&
	git reset -q --soft HEAD~2 &&
	git commit -q -m squashed &&
	git checkout -q other^{} &&
	test_must_fail git rebase squashed &&
	git rebase --quit
'
 
test_done