File: t4065-diff-anchored.sh

package info (click to toggle)
git 1:2.20.1-2+deb10u3
  • links: PTS, VCS
  • area: main
  • in suites: buster
  • size: 45,676 kB
  • sloc: ansic: 210,769; sh: 180,432; perl: 29,102; tcl: 21,663; python: 6,143; makefile: 3,700; sed: 189; php: 120; asm: 98; csh: 45; ruby: 24; lisp: 12
file content (94 lines) | stat: -rwxr-xr-x 2,624 bytes parent folder | download | duplicates (8)
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
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
#!/bin/sh

test_description='anchored diff algorithm'

. ./test-lib.sh

test_expect_success '--anchored' '
	printf "a\nb\nc\n" >pre &&
	printf "c\na\nb\n" >post &&

	# normally, c is moved to produce the smallest diff
	test_expect_code 1 git diff --no-index pre post >diff &&
	grep "^+c" diff &&

	# with anchor, a is moved
	test_expect_code 1 git diff --no-index --anchored=c pre post >diff &&
	grep "^+a" diff
'

test_expect_success '--anchored multiple' '
	printf "a\nb\nc\nd\ne\nf\n" >pre &&
	printf "c\na\nb\nf\nd\ne\n" >post &&

	# with 1 anchor, c is not moved, but f is moved
	test_expect_code 1 git diff --no-index --anchored=c pre post >diff &&
	grep "^+a" diff && # a is moved instead of c
	grep "^+f" diff &&

	# with 2 anchors, c and f are not moved
	test_expect_code 1 git diff --no-index --anchored=c --anchored=f pre post >diff &&
	grep "^+a" diff &&
	grep "^+d" diff # d is moved instead of f
'

test_expect_success '--anchored with nonexistent line has no effect' '
	printf "a\nb\nc\n" >pre &&
	printf "c\na\nb\n" >post &&

	test_expect_code 1 git diff --no-index --anchored=x pre post >diff &&
	grep "^+c" diff
'

test_expect_success '--anchored with non-unique line has no effect' '
	printf "a\nb\nc\nd\ne\nc\n" >pre &&
	printf "c\na\nb\nc\nd\ne\n" >post &&

	test_expect_code 1 git diff --no-index --anchored=c pre post >diff &&
	grep "^+c" diff
'

test_expect_success 'diff still produced with impossible multiple --anchored' '
	printf "a\nb\nc\n" >pre &&
	printf "c\na\nb\n" >post &&

	test_expect_code 1 git diff --no-index --anchored=a --anchored=c pre post >diff &&
	mv post expected_post &&

	# Ensure that the diff is correct by applying it and then
	# comparing the result with the original
	git apply diff &&
	diff expected_post post
'

test_expect_success 'later algorithm arguments override earlier ones' '
	printf "a\nb\nc\n" >pre &&
	printf "c\na\nb\n" >post &&

	test_expect_code 1 git diff --no-index --patience --anchored=c pre post >diff &&
	grep "^+a" diff &&

	test_expect_code 1 git diff --no-index --anchored=c --patience pre post >diff &&
	grep "^+c" diff &&

	test_expect_code 1 git diff --no-index --histogram --anchored=c pre post >diff &&
	grep "^+a" diff &&

	test_expect_code 1 git diff --no-index --anchored=c --histogram pre post >diff &&
	grep "^+c" diff
'

test_expect_success '--anchored works with other commands like "git show"' '
	printf "a\nb\nc\n" >file &&
	git add file &&
	git commit -m foo &&
	printf "c\na\nb\n" >file &&
	git add file &&
	git commit -m foo &&

	# with anchor, a is moved
	git show --patience --anchored=c >diff &&
	grep "^+a" diff
'

test_done