summaryrefslogtreecommitdiff
path: root/t/t4002-diff-basic.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-05-06 17:52:58 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-05-06 17:52:58 (GMT)
commit22dbeee715e4c9fae3e3fdc1f3a2c4a6ec90e593 (patch)
tree0091b831de88064187f0ddfd637b8ff93883eded /t/t4002-diff-basic.sh
parent6c252ef79e314eef8fca862cca8a63329fa7591c (diff)
parent095ce9538b738db28d5e9a6e05d94c7e3f55f39d (diff)
downloadgit-22dbeee715e4c9fae3e3fdc1f3a2c4a6ec90e593.zip
git-22dbeee715e4c9fae3e3fdc1f3a2c4a6ec90e593.tar.gz
git-22dbeee715e4c9fae3e3fdc1f3a2c4a6ec90e593.tar.bz2
Merge branch 'jc/fix-diff-files-unmerged'
* jc/fix-diff-files-unmerged: diff-files: show unmerged entries correctly diff: remove often unused parameters from diff_unmerge() diff.c: return filepair from diff_unmerge() test: use $_z40 from test-lib
Diffstat (limited to 't/t4002-diff-basic.sh')
-rwxr-xr-xt/t4002-diff-basic.sh5
1 files changed, 1 insertions, 4 deletions
diff --git a/t/t4002-diff-basic.sh b/t/t4002-diff-basic.sh
index 9fb8ca0..a5e8b83 100755
--- a/t/t4002-diff-basic.sh
+++ b/t/t4002-diff-basic.sh
@@ -126,15 +126,12 @@ cat >.test-recursive-AB <<\EOF
:100644 100644 3fdbe17fd013303a2e981e1ca1c6cd6e72789087 7e09d6a3a14bd630913e8c75693cea32157b606d M Z/NM
EOF
-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"
-z40='0000000000000000000000000000000000000000'
cmp_diff_files_output () {
# diff-files never reports additions. Also it does not fill in the
# object ID for the changed files because it wants you to look at the
# filesystem.
sed <"$2" >.test-tmp \
- -e '/^:000000 /d;s/'$x40'\( [MCRNDU][0-9]*\) /'$z40'\1 /' &&
+ -e '/^:000000 /d;s/'$_x40'\( [MCRNDU][0-9]*\) /'$_z40'\1 /' &&
test_cmp "$1" .test-tmp
}