mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
t1002-read-tree-m-u-2way.sh: use 'git diff -U0' rather than 'diff -U0'
Some old platforms have an old diff which doesn't have the -U option. 'git diff' can be used in its place. Adjust the comparison function to strip git's additional header lines to make this possible. Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
da9973c6f9
commit
26e08a0190
|
@ -14,6 +14,8 @@ _x40='[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]'
|
||||||
_x40="$_x40$_x40$_x40$_x40$_x40$_x40$_x40$_x40"
|
_x40="$_x40$_x40$_x40$_x40$_x40$_x40$_x40$_x40"
|
||||||
compare_change () {
|
compare_change () {
|
||||||
sed >current \
|
sed >current \
|
||||||
|
-e '1{/^diff --git /d;}' \
|
||||||
|
-e '2{/^index /d;}' \
|
||||||
-e '/^--- /d; /^+++ /d; /^@@ /d;' \
|
-e '/^--- /d; /^+++ /d; /^@@ /d;' \
|
||||||
-e 's/^\(.[0-7][0-7][0-7][0-7][0-7][0-7]\) '"$_x40"' /\1 X /' "$1"
|
-e 's/^\(.[0-7][0-7][0-7][0-7][0-7][0-7]\) '"$_x40"' /\1 X /' "$1"
|
||||||
test_cmp expected current
|
test_cmp expected current
|
||||||
|
@ -75,7 +77,7 @@ test_expect_success \
|
||||||
git update-index --add yomin &&
|
git update-index --add yomin &&
|
||||||
git read-tree -m -u $treeH $treeM &&
|
git read-tree -m -u $treeH $treeM &&
|
||||||
git ls-files --stage >4.out || return 1
|
git ls-files --stage >4.out || return 1
|
||||||
diff -U0 M.out 4.out >4diff.out
|
git diff -U0 --no-index M.out 4.out >4diff.out
|
||||||
compare_change 4diff.out expected &&
|
compare_change 4diff.out expected &&
|
||||||
check_cache_at yomin clean &&
|
check_cache_at yomin clean &&
|
||||||
sum bozbar frotz nitfol >actual4.sum &&
|
sum bozbar frotz nitfol >actual4.sum &&
|
||||||
|
@ -94,7 +96,7 @@ test_expect_success \
|
||||||
echo yomin yomin >yomin &&
|
echo yomin yomin >yomin &&
|
||||||
git read-tree -m -u $treeH $treeM &&
|
git read-tree -m -u $treeH $treeM &&
|
||||||
git ls-files --stage >5.out || return 1
|
git ls-files --stage >5.out || return 1
|
||||||
diff -U0 M.out 5.out >5diff.out
|
git diff -U0 --no-index M.out 5.out >5diff.out
|
||||||
compare_change 5diff.out expected &&
|
compare_change 5diff.out expected &&
|
||||||
check_cache_at yomin dirty &&
|
check_cache_at yomin dirty &&
|
||||||
sum bozbar frotz nitfol >actual5.sum &&
|
sum bozbar frotz nitfol >actual5.sum &&
|
||||||
|
@ -206,7 +208,7 @@ test_expect_success \
|
||||||
git update-index --add nitfol &&
|
git update-index --add nitfol &&
|
||||||
git read-tree -m -u $treeH $treeM &&
|
git read-tree -m -u $treeH $treeM &&
|
||||||
git ls-files --stage >14.out || return 1
|
git ls-files --stage >14.out || return 1
|
||||||
diff -U0 M.out 14.out >14diff.out
|
git diff -U0 --no-index M.out 14.out >14diff.out
|
||||||
compare_change 14diff.out expected &&
|
compare_change 14diff.out expected &&
|
||||||
sum bozbar frotz >actual14.sum &&
|
sum bozbar frotz >actual14.sum &&
|
||||||
grep -v nitfol M.sum > expected14.sum &&
|
grep -v nitfol M.sum > expected14.sum &&
|
||||||
|
@ -227,7 +229,7 @@ test_expect_success \
|
||||||
echo nitfol nitfol nitfol >nitfol &&
|
echo nitfol nitfol nitfol >nitfol &&
|
||||||
git read-tree -m -u $treeH $treeM &&
|
git read-tree -m -u $treeH $treeM &&
|
||||||
git ls-files --stage >15.out || return 1
|
git ls-files --stage >15.out || return 1
|
||||||
diff -U0 M.out 15.out >15diff.out
|
git diff -U0 --no-index M.out 15.out >15diff.out
|
||||||
compare_change 15diff.out expected &&
|
compare_change 15diff.out expected &&
|
||||||
check_cache_at nitfol dirty &&
|
check_cache_at nitfol dirty &&
|
||||||
sum bozbar frotz >actual15.sum &&
|
sum bozbar frotz >actual15.sum &&
|
||||||
|
|
Loading…
Reference in a new issue