builtin-merge: release the lockfile in try_merge_strategy()
[git/dscho.git] / t / t4029-diff-trailing-space.sh
blob4ca65e033289fe4ac757a3f19ecd3169bdb434e4
1 #!/bin/bash
3 # Copyright (c) Jim Meyering
5 test_description='diff honors config option, diff.suppress-blank-empty'
7 . ./test-lib.sh
9 cat <<\EOF > exp ||
10 diff --git a/f b/f
11 index 5f6a263..8cb8bae 100644
12 --- a/f
13 +++ b/f
14 @@ -1,2 +1,2 @@
18 EOF
19 exit 1
21 test_expect_success \
22 "$test_description" \
23 'printf "\nx\n" > f &&
24 git add f &&
25 git commit -q -m. f &&
26 printf "\ny\n" > f &&
27 git config --bool diff.suppress-blank-empty true &&
28 git diff f > actual &&
29 test_cmp exp actual &&
30 perl -i.bak -p -e "s/^\$/ /" exp &&
31 git config --bool diff.suppress-blank-empty false &&
32 git diff f > actual &&
33 test_cmp exp actual &&
34 git config --bool --unset diff.suppress-blank-empty &&
35 git diff f > actual &&
36 test_cmp exp actual
39 test_done