blob: 97172b46b2afd52ca8f278f9525da01a56823e59 (
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
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
|
#!/bin/sh
#
# Copyright (c) 2012 Mozilla Foundation
#
test_description='diff.context configuration'
. ./test-lib.sh
test_expect_success 'setup' '
cat >template <<-\EOF &&
firstline
b
c
d
e
f
preline
TARGET
postline
i
j
k
l
m
n
EOF
sed "/TARGET/d" >x <template &&
git update-index --add x &&
git commit -m initial &&
sed "s/TARGET/ADDED/" >x <template &&
git update-index --add x &&
git commit -m next &&
sed "s/TARGET/MODIFIED/" >x <template
'
test_expect_success 'the default number of context lines is 3' '
git diff >output &&
! grep "^ d" output &&
grep "^ e" output &&
grep "^ j" output &&
! grep "^ k" output
'
test_expect_success 'diff.context honored by "log"' '
git log -1 -p >output &&
! grep firstline output &&
git config diff.context 8 &&
git log -1 -p >output &&
grep "^ firstline" output
'
test_expect_success 'The -U option overrides diff.context' '
git config diff.context 8 &&
git log -U4 -1 >output &&
! grep "^ firstline" output
'
test_expect_success 'diff.context honored by "diff"' '
git config diff.context 8 &&
git diff >output &&
grep "^ firstline" output
'
test_expect_success 'plumbing not affected' '
git config diff.context 8 &&
git diff-files -p >output &&
! grep "^ firstline" output
'
test_expect_success 'non-integer config parsing' '
git config diff.context no &&
test_must_fail git diff 2>output &&
test_i18ngrep "bad config value" output
'
test_expect_success 'negative integer config parsing' '
git config diff.context -1 &&
test_must_fail git diff 2>output &&
test_i18ngrep "bad config file" output
'
test_expect_success '-U0 is valid, so is diff.context=0' '
git config diff.context 0 &&
git diff >output &&
grep "^-ADDED" output &&
grep "^+MODIFIED" output
'
test_done
|
