You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
122 lines
2.0 KiB
122 lines
2.0 KiB
#!/bin/sh |
|
# |
|
# Copyright (c) 2006 Johannes E. Schindelin |
|
# |
|
|
|
test_description='Test special whitespace in diff engine. |
|
|
|
' |
|
. ./test-lib.sh |
|
. ../diff-lib.sh |
|
|
|
# Ray Lehtiniemi's example |
|
|
|
cat << EOF > x |
|
do { |
|
nothing; |
|
} while (0); |
|
EOF |
|
|
|
git-update-index --add x |
|
|
|
cat << EOF > x |
|
do |
|
{ |
|
nothing; |
|
} |
|
while (0); |
|
EOF |
|
|
|
cat << EOF > expect |
|
diff --git a/x b/x |
|
index adf3937..6edc172 100644 |
|
--- a/x |
|
+++ b/x |
|
@@ -1,3 +1,5 @@ |
|
-do { |
|
+do |
|
+{ |
|
nothing; |
|
-} while (0); |
|
+} |
|
+while (0); |
|
EOF |
|
|
|
git-diff > out |
|
test_expect_success "Ray's example without options" 'diff -u expect out' |
|
|
|
git-diff -w > out |
|
test_expect_success "Ray's example with -w" 'diff -u expect out' |
|
|
|
git-diff -b > out |
|
test_expect_success "Ray's example with -b" 'diff -u expect out' |
|
|
|
tr 'Q' '\015' << EOF > x |
|
whitespace at beginning |
|
whitespace change |
|
whitespace in the middle |
|
whitespace at end |
|
unchanged line |
|
CR at endQ |
|
EOF |
|
|
|
git-update-index x |
|
|
|
cat << EOF > x |
|
whitespace at beginning |
|
whitespace change |
|
white space in the middle |
|
whitespace at end |
|
unchanged line |
|
CR at end |
|
EOF |
|
|
|
tr 'Q' '\015' << EOF > expect |
|
diff --git a/x b/x |
|
index d99af23..8b32fb5 100644 |
|
--- a/x |
|
+++ b/x |
|
@@ -1,6 +1,6 @@ |
|
-whitespace at beginning |
|
-whitespace change |
|
-whitespace in the middle |
|
-whitespace at end |
|
+ whitespace at beginning |
|
+whitespace change |
|
+white space in the middle |
|
+whitespace at end |
|
unchanged line |
|
-CR at endQ |
|
+CR at end |
|
EOF |
|
git-diff > out |
|
test_expect_success 'another test, without options' 'diff -u expect out' |
|
|
|
cat << EOF > expect |
|
diff --git a/x b/x |
|
index d99af23..8b32fb5 100644 |
|
EOF |
|
git-diff -w > out |
|
test_expect_success 'another test, with -w' 'diff -u expect out' |
|
|
|
tr 'Q' '\015' << EOF > expect |
|
diff --git a/x b/x |
|
index d99af23..8b32fb5 100644 |
|
--- a/x |
|
+++ b/x |
|
@@ -1,6 +1,6 @@ |
|
-whitespace at beginning |
|
+ whitespace at beginning |
|
whitespace change |
|
-whitespace in the middle |
|
-whitespace at end |
|
+white space in the middle |
|
+whitespace at end |
|
unchanged line |
|
-CR at endQ |
|
+CR at end |
|
EOF |
|
git-diff -b > out |
|
test_expect_success 'another test, with -b' 'diff -u expect out' |
|
|
|
test_done
|
|
|