mirror of
https://github.com/git/git
synced 2024-08-28 12:09:19 +00:00
![Johannes Schindelin](/assets/img/avatar_default.png)
Now that "git diff" handles stdin and relative paths outside the working tree correctly, we can convert all instances of "diff -u" to "git diff". This commit is really the result of $ perl -pi.bak -e 's/diff -u/git diff/' $(git grep -l "diff -u" t/) Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net> (cherry picked from commit c699a40d68215c7e44a5b26117a35c8a56fbd387)
121 lines
1.9 KiB
Bash
Executable file
121 lines
1.9 KiB
Bash
Executable file
#!/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" 'git diff expect out'
|
|
|
|
git-diff -w > out
|
|
test_expect_success "Ray's example with -w" 'git diff expect out'
|
|
|
|
git-diff -b > out
|
|
test_expect_success "Ray's example with -b" 'git diff 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' 'git diff 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' 'git diff 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
|
|
+white space in the middle
|
|
whitespace at end
|
|
unchanged line
|
|
CR at endQ
|
|
EOF
|
|
git-diff -b > out
|
|
test_expect_success 'another test, with -b' 'git diff expect out'
|
|
|
|
test_done
|