Andrew's git - gitweb.git/blob - t/t4002-diff-basic.sh

   1#!/bin/sh
   2#
   3# Copyright (c) 2005 Junio C Hamano
   4#
   5
   6test_description='Test diff raw-output.
   7
   8'
   9. ./test-lib.sh
  10. ../lib-read-tree-m-3way.sh
  11
  12cat >.test-plain-OA <<\EOF
  13+100644 blob ccba72ad3888a3520b39efcf780b9ee64167535d AA
  14+100644 blob 7e426fb079479fd67f6d81f984e4ec649a44bc25 AN
  15-100644 blob bcc68ef997017466d5c9094bcf7692295f588c9a DD
  16+040000 tree 6d50f65d3bdab91c63444294d38f08aeff328e42 DF
  17-100644 blob 141c1f1642328e4bc46a7d801a71da392e66791e DM
  18-100644 blob 35abde1506ddf806572ff4d407bd06885d0f8ee9 DN
  19+100644 blob 1d41122ebdd7a640f29d3c9cc4f9d70094374762 LL
  20*100644->100644 blob 03f24c8c4700babccfd28b654e7e8eac402ad6cd->103d9f89b50b9aad03054b579be5e7aa665f2d57 MD
  21*100644->100644 blob b258508afb7ceb449981bd9d63d2d3e971bf8d34->b431b272d829ff3aa4d1a5085f4394ab4d3305b6 MM
  22*100644->100644 blob bd084b0c27c7b6cc34f11d6d0509a29be3caf970->a716d58de4a570e0038f5c307bd8db34daea021f MN
  23*100644->100644 blob 40c959f984c8b89a2b02520d17f00d717f024397->2ac547ae9614a00d1b28275de608131f7a0e259f SS
  24*100644->100644 blob 4ac13458899ab908ef3b1128fa378daefc88d356->4c86f9a85fbc5e6804ee2e17a797538fbe785bca TT
  25*040000->040000 tree 7d670fdcdb9929f6c7dac196ff78689cd1c566a1->5e5f22072bb39f6e12cf663a57cb634c76eefb49 Z
  26EOF
  27
  28cat >.test-recursive-OA <<\EOF
  29+100644 blob ccba72ad3888a3520b39efcf780b9ee64167535d AA
  30+100644 blob 7e426fb079479fd67f6d81f984e4ec649a44bc25 AN
  31-100644 blob bcc68ef997017466d5c9094bcf7692295f588c9a DD
  32+100644 blob 68a6d8b91da11045cf4aa3a5ab9f2a781c701249 DF/DF
  33-100644 blob 141c1f1642328e4bc46a7d801a71da392e66791e DM
  34-100644 blob 35abde1506ddf806572ff4d407bd06885d0f8ee9 DN
  35+100644 blob 1d41122ebdd7a640f29d3c9cc4f9d70094374762 LL
  36*100644->100644 blob 03f24c8c4700babccfd28b654e7e8eac402ad6cd->103d9f89b50b9aad03054b579be5e7aa665f2d57 MD
  37*100644->100644 blob b258508afb7ceb449981bd9d63d2d3e971bf8d34->b431b272d829ff3aa4d1a5085f4394ab4d3305b6 MM
  38*100644->100644 blob bd084b0c27c7b6cc34f11d6d0509a29be3caf970->a716d58de4a570e0038f5c307bd8db34daea021f MN
  39*100644->100644 blob 40c959f984c8b89a2b02520d17f00d717f024397->2ac547ae9614a00d1b28275de608131f7a0e259f SS
  40*100644->100644 blob 4ac13458899ab908ef3b1128fa378daefc88d356->4c86f9a85fbc5e6804ee2e17a797538fbe785bca TT
  41+100644 blob 8acb8e9750e3f644bf323fcf3d338849db106c77 Z/AA
  42+100644 blob 087494262084cefee7ed484d20c8dc0580791272 Z/AN
  43-100644 blob 879007efae624d2b1307214b24a956f0a8d686a8 Z/DD
  44-100644 blob 9b541b2275c06e3a7b13f28badf5294e2ae63df4 Z/DM
  45-100644 blob beb5d38c55283d280685ea21a0e50cfcc0ca064a Z/DN
  46*100644->100644 blob d41fda41b7ec4de46b43cb7ea42a45001ae393d5->a79ac3be9377639e1c7d1edf1ae1b3a5f0ccd8a9 Z/MD
  47*100644->100644 blob 4ca22bae2527d3d9e1676498a0fba3b355bd1278->61422ba9c2c873416061a88cd40a59a35b576474 Z/MM
  48*100644->100644 blob b16d7b25b869f2beb124efa53467d8a1550ad694->a5c544c21cfcb07eb80a4d89a5b7d1570002edfd Z/MN
  49EOF
  50cat >.test-plain-OB <<\EOF
  51+100644 blob 6aa2b5335b16431a0ef71e5c0a28be69183cf6a2 AA
  52-100644 blob bcc68ef997017466d5c9094bcf7692295f588c9a DD
  53+100644 blob 71420ab81e254145d26d6fc0cddee64c1acd4787 DF
  54*100644->100644 blob 141c1f1642328e4bc46a7d801a71da392e66791e->3c4d8de5fbad08572bab8e10eef8dbb264cf0231 DM
  55+100644 blob 1d41122ebdd7a640f29d3c9cc4f9d70094374762 LL
  56-100644 blob 03f24c8c4700babccfd28b654e7e8eac402ad6cd MD
  57*100644->100644 blob b258508afb7ceb449981bd9d63d2d3e971bf8d34->19989d4559aae417fedee240ccf2ba315ea4dc2b MM
  58+100644 blob 15885881ea69115351c09b38371f0348a3fb8c67 NA
  59-100644 blob a4e179e4291e5536a5e1c82e091052772d2c5a93 ND
  60*100644->100644 blob c8f25781e8f1792e3e40b74225e20553041b5226->cdb9a8c3da571502ac30225e9c17beccb8387983 NM
  61*100644->100644 blob 40c959f984c8b89a2b02520d17f00d717f024397->2ac547ae9614a00d1b28275de608131f7a0e259f SS
  62*100644->100644 blob 4ac13458899ab908ef3b1128fa378daefc88d356->c4e4a12231b9fa79a0053cb6077fcb21bb5b135a TT
  63*040000->040000 tree 7d670fdcdb9929f6c7dac196ff78689cd1c566a1->1ba523955d5160681af65cb776411f574c1e8155 Z
  64EOF
  65cat >.test-recursive-OB <<\EOF
  66+100644 blob 6aa2b5335b16431a0ef71e5c0a28be69183cf6a2 AA
  67-100644 blob bcc68ef997017466d5c9094bcf7692295f588c9a DD
  68+100644 blob 71420ab81e254145d26d6fc0cddee64c1acd4787 DF
  69*100644->100644 blob 141c1f1642328e4bc46a7d801a71da392e66791e->3c4d8de5fbad08572bab8e10eef8dbb264cf0231 DM
  70+100644 blob 1d41122ebdd7a640f29d3c9cc4f9d70094374762 LL
  71-100644 blob 03f24c8c4700babccfd28b654e7e8eac402ad6cd MD
  72*100644->100644 blob b258508afb7ceb449981bd9d63d2d3e971bf8d34->19989d4559aae417fedee240ccf2ba315ea4dc2b MM
  73+100644 blob 15885881ea69115351c09b38371f0348a3fb8c67 NA
  74-100644 blob a4e179e4291e5536a5e1c82e091052772d2c5a93 ND
  75*100644->100644 blob c8f25781e8f1792e3e40b74225e20553041b5226->cdb9a8c3da571502ac30225e9c17beccb8387983 NM
  76*100644->100644 blob 40c959f984c8b89a2b02520d17f00d717f024397->2ac547ae9614a00d1b28275de608131f7a0e259f SS
  77*100644->100644 blob 4ac13458899ab908ef3b1128fa378daefc88d356->c4e4a12231b9fa79a0053cb6077fcb21bb5b135a TT
  78+100644 blob 6c0b99286d0bce551ac4a7b3dff8b706edff3715 Z/AA
  79-100644 blob 879007efae624d2b1307214b24a956f0a8d686a8 Z/DD
  80*100644->100644 blob 9b541b2275c06e3a7b13f28badf5294e2ae63df4->d77371d15817fcaa57eeec27f770c505ba974ec1 Z/DM
  81-100644 blob d41fda41b7ec4de46b43cb7ea42a45001ae393d5 Z/MD
  82*100644->100644 blob 4ca22bae2527d3d9e1676498a0fba3b355bd1278->697aad7715a1e7306ca76290a3dd4208fbaeddfa Z/MM
  83+100644 blob d12979c22fff69c59ca9409e7a8fe3ee25eaee80 Z/NA
  84-100644 blob a18393c636b98e9bd7296b8b437ea4992b72440c Z/ND
  85*100644->100644 blob 3fdbe17fd013303a2e981e1ca1c6cd6e72789087->7e09d6a3a14bd630913e8c75693cea32157b606d Z/NM
  86EOF
  87cat >.test-plain-AB <<\EOF
  88*100644->100644 blob ccba72ad3888a3520b39efcf780b9ee64167535d->6aa2b5335b16431a0ef71e5c0a28be69183cf6a2 AA
  89-100644 blob 7e426fb079479fd67f6d81f984e4ec649a44bc25 AN
  90+100644 blob 71420ab81e254145d26d6fc0cddee64c1acd4787 DF
  91-040000 tree 6d50f65d3bdab91c63444294d38f08aeff328e42 DF
  92+100644 blob 3c4d8de5fbad08572bab8e10eef8dbb264cf0231 DM
  93+100644 blob 35abde1506ddf806572ff4d407bd06885d0f8ee9 DN
  94-100644 blob 103d9f89b50b9aad03054b579be5e7aa665f2d57 MD
  95*100644->100644 blob b431b272d829ff3aa4d1a5085f4394ab4d3305b6->19989d4559aae417fedee240ccf2ba315ea4dc2b MM
  96*100644->100644 blob a716d58de4a570e0038f5c307bd8db34daea021f->bd084b0c27c7b6cc34f11d6d0509a29be3caf970 MN
  97+100644 blob 15885881ea69115351c09b38371f0348a3fb8c67 NA
  98-100644 blob a4e179e4291e5536a5e1c82e091052772d2c5a93 ND
  99*100644->100644 blob c8f25781e8f1792e3e40b74225e20553041b5226->cdb9a8c3da571502ac30225e9c17beccb8387983 NM
 100*100644->100644 blob 4c86f9a85fbc5e6804ee2e17a797538fbe785bca->c4e4a12231b9fa79a0053cb6077fcb21bb5b135a TT
 101*040000->040000 tree 5e5f22072bb39f6e12cf663a57cb634c76eefb49->1ba523955d5160681af65cb776411f574c1e8155 Z
 102EOF
 103cat >.test-recursive-AB <<\EOF
 104*100644->100644 blob ccba72ad3888a3520b39efcf780b9ee64167535d->6aa2b5335b16431a0ef71e5c0a28be69183cf6a2 AA
 105-100644 blob 7e426fb079479fd67f6d81f984e4ec649a44bc25 AN
 106+100644 blob 71420ab81e254145d26d6fc0cddee64c1acd4787 DF
 107-100644 blob 68a6d8b91da11045cf4aa3a5ab9f2a781c701249 DF/DF
 108+100644 blob 3c4d8de5fbad08572bab8e10eef8dbb264cf0231 DM
 109+100644 blob 35abde1506ddf806572ff4d407bd06885d0f8ee9 DN
 110-100644 blob 103d9f89b50b9aad03054b579be5e7aa665f2d57 MD
 111*100644->100644 blob b431b272d829ff3aa4d1a5085f4394ab4d3305b6->19989d4559aae417fedee240ccf2ba315ea4dc2b MM
 112*100644->100644 blob a716d58de4a570e0038f5c307bd8db34daea021f->bd084b0c27c7b6cc34f11d6d0509a29be3caf970 MN
 113+100644 blob 15885881ea69115351c09b38371f0348a3fb8c67 NA
 114-100644 blob a4e179e4291e5536a5e1c82e091052772d2c5a93 ND
 115*100644->100644 blob c8f25781e8f1792e3e40b74225e20553041b5226->cdb9a8c3da571502ac30225e9c17beccb8387983 NM
 116*100644->100644 blob 4c86f9a85fbc5e6804ee2e17a797538fbe785bca->c4e4a12231b9fa79a0053cb6077fcb21bb5b135a TT
 117*100644->100644 blob 8acb8e9750e3f644bf323fcf3d338849db106c77->6c0b99286d0bce551ac4a7b3dff8b706edff3715 Z/AA
 118-100644 blob 087494262084cefee7ed484d20c8dc0580791272 Z/AN
 119+100644 blob d77371d15817fcaa57eeec27f770c505ba974ec1 Z/DM
 120+100644 blob beb5d38c55283d280685ea21a0e50cfcc0ca064a Z/DN
 121-100644 blob a79ac3be9377639e1c7d1edf1ae1b3a5f0ccd8a9 Z/MD
 122*100644->100644 blob 61422ba9c2c873416061a88cd40a59a35b576474->697aad7715a1e7306ca76290a3dd4208fbaeddfa Z/MM
 123*100644->100644 blob a5c544c21cfcb07eb80a4d89a5b7d1570002edfd->b16d7b25b869f2beb124efa53467d8a1550ad694 Z/MN
 124+100644 blob d12979c22fff69c59ca9409e7a8fe3ee25eaee80 Z/NA
 125-100644 blob a18393c636b98e9bd7296b8b437ea4992b72440c Z/ND
 126*100644->100644 blob 3fdbe17fd013303a2e981e1ca1c6cd6e72789087->7e09d6a3a14bd630913e8c75693cea32157b606d Z/NM
 127EOF
 128
 129
 130x40='[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]'
 131x40="$x40$x40$x40$x40$x40$x40$x40$x40"
 132z40='0000000000000000000000000000000000000000'
 133cmp_diff_files_output () {
 134    # diff-files never reports additions.  Also it does not fill in the
 135    # object ID for the changed files because it wants you to look at the
 136    # filesystem.
 137    sed <"$2" >.test-tmp \
 138        -e '/^+/d;/\^*/s/\( '$x40'->\)'$x40' /\1'$z40' /' &&
 139    diff "$1" .test-tmp
 140}
 141
 142test_expect_success \
 143    'diff-tree of known trees.' \
 144    'git-diff-tree $tree_O $tree_A >.test-a &&
 145     cmp -s .test-a .test-plain-OA'
 146
 147test_expect_success \
 148    'diff-tree of known trees.' \
 149    'git-diff-tree -r $tree_O $tree_A >.test-a &&
 150     cmp -s .test-a .test-recursive-OA'
 151
 152test_expect_success \
 153    'diff-tree of known trees.' \
 154    'git-diff-tree $tree_O $tree_B >.test-a &&
 155     cmp -s .test-a .test-plain-OB'
 156
 157test_expect_success \
 158    'diff-tree of known trees.' \
 159    'git-diff-tree -r $tree_O $tree_B >.test-a &&
 160     cmp -s .test-a .test-recursive-OB'
 161
 162test_expect_success \
 163    'diff-tree of known trees.' \
 164    'git-diff-tree $tree_A $tree_B >.test-a &&
 165     cmp -s .test-a .test-plain-AB'
 166
 167test_expect_success \
 168    'diff-tree of known trees.' \
 169    'git-diff-tree -r $tree_A $tree_B >.test-a &&
 170     cmp -s .test-a .test-recursive-AB'
 171
 172test_expect_success \
 173    'diff-cache O with A in cache' \
 174    'git-read-tree $tree_A &&
 175     git-diff-cache --cached $tree_O >.test-a &&
 176     cmp -s .test-a .test-recursive-OA'
 177
 178test_expect_success \
 179    'diff-cache O with B in cache' \
 180    'git-read-tree $tree_B &&
 181     git-diff-cache --cached $tree_O >.test-a &&
 182     cmp -s .test-a .test-recursive-OB'
 183
 184test_expect_success \
 185    'diff-cache A with B in cache' \
 186    'git-read-tree $tree_B &&
 187     git-diff-cache --cached $tree_A >.test-a &&
 188     cmp -s .test-a .test-recursive-AB'
 189
 190test_expect_success \
 191    'diff-files with O in cache and A checked out' \
 192    'rm -fr Z [A-Z][A-Z] &&
 193     git-read-tree $tree_A &&
 194     git-checkout-cache -f -a &&
 195     git-read-tree -m $tree_O || (exit 1)
 196     git-update-cache --refresh >/dev/null ;# this can exit non-zero
 197     git-diff-files >.test-a &&
 198     cmp_diff_files_output .test-a .test-recursive-OA'
 199
 200test_expect_success \
 201    'diff-files with O in cache and B checked out' \
 202    'rm -fr Z [A-Z][A-Z] &&
 203     git-read-tree $tree_B &&
 204     git-checkout-cache -f -a &&
 205     git-read-tree -m $tree_O || (exit 1)
 206     git-update-cache --refresh >/dev/null ;# this can exit non-zero
 207     git-diff-files >.test-a &&
 208     cmp_diff_files_output .test-a .test-recursive-OB'
 209
 210test_expect_success \
 211    'diff-files with A in cache and B checked out' \
 212    'rm -fr Z [A-Z][A-Z] &&
 213     git-read-tree $tree_B &&
 214     git-checkout-cache -f -a &&
 215     git-read-tree -m $tree_A || (exit 1)
 216     git-update-cache --refresh >/dev/null ;# this can exit non-zero
 217     git-diff-files >.test-a &&
 218     cmp_diff_files_output .test-a .test-recursive-AB'
 219
 220################################################################
 221# Now we have established the baseline, we do not have to
 222# rely on individual object ID values that much.
 223
 224test_expect_success \
 225    'diff-tree O A == diff-tree -R A O' \
 226    'git-diff-tree $tree_O $tree_A >.test-a &&
 227    git-diff-tree -R $tree_A $tree_O >.test-b &&
 228    cmp -s .test-a .test-b'
 229
 230test_expect_success \
 231    'diff-tree -r O A == diff-tree -r -R A O' \
 232    'git-diff-tree -r $tree_O $tree_A >.test-a &&
 233    git-diff-tree -r -R $tree_A $tree_O >.test-b &&
 234    cmp -s .test-a .test-b'
 235
 236test_expect_success \
 237    'diff-tree B A == diff-tree -R A B' \
 238    'git-diff-tree $tree_B $tree_A >.test-a &&
 239    git-diff-tree -R $tree_A $tree_B >.test-b &&
 240    cmp -s .test-a .test-b'
 241
 242test_expect_success \
 243    'diff-tree -r B A == diff-tree -r -R A B' \
 244    'git-diff-tree -r $tree_B $tree_A >.test-a &&
 245    git-diff-tree -r -R $tree_A $tree_B >.test-b &&
 246    cmp -s .test-a .test-b'
 247
 248test_done