Junio C Hamano | b45563a | 2007-11-30 22:22:38 -0800 | [diff] [blame] | 1 | #!/bin/sh |
| 2 | |
| 3 | test_description='typechange rename detection' |
| 4 | |
| 5 | . ./test-lib.sh |
| 6 | |
Johannes Sixt | 622f98e | 2013-06-07 22:53:32 +0200 | [diff] [blame] | 7 | test_expect_success setup ' |
Junio C Hamano | b45563a | 2007-11-30 22:22:38 -0800 | [diff] [blame] | 8 | |
| 9 | rm -f foo bar && |
Junio C Hamano | bfdbee9 | 2008-08-08 02:26:28 -0700 | [diff] [blame] | 10 | cat "$TEST_DIRECTORY"/../COPYING >foo && |
Johannes Sixt | 622f98e | 2013-06-07 22:53:32 +0200 | [diff] [blame] | 11 | test_ln_s_add linklink bar && |
| 12 | git add foo && |
Junio C Hamano | b45563a | 2007-11-30 22:22:38 -0800 | [diff] [blame] | 13 | git commit -a -m Initial && |
| 14 | git tag one && |
| 15 | |
Johannes Sixt | 622f98e | 2013-06-07 22:53:32 +0200 | [diff] [blame] | 16 | git rm -f foo bar && |
Junio C Hamano | bfdbee9 | 2008-08-08 02:26:28 -0700 | [diff] [blame] | 17 | cat "$TEST_DIRECTORY"/../COPYING >bar && |
Johannes Sixt | 622f98e | 2013-06-07 22:53:32 +0200 | [diff] [blame] | 18 | test_ln_s_add linklink foo && |
| 19 | git add bar && |
Junio C Hamano | b45563a | 2007-11-30 22:22:38 -0800 | [diff] [blame] | 20 | git commit -a -m Second && |
| 21 | git tag two && |
| 22 | |
Johannes Sixt | 622f98e | 2013-06-07 22:53:32 +0200 | [diff] [blame] | 23 | git rm -f foo bar && |
Junio C Hamano | bfdbee9 | 2008-08-08 02:26:28 -0700 | [diff] [blame] | 24 | cat "$TEST_DIRECTORY"/../COPYING >foo && |
Junio C Hamano | b45563a | 2007-11-30 22:22:38 -0800 | [diff] [blame] | 25 | git add foo && |
| 26 | git commit -a -m Third && |
| 27 | git tag three && |
| 28 | |
| 29 | mv foo bar && |
Johannes Sixt | 622f98e | 2013-06-07 22:53:32 +0200 | [diff] [blame] | 30 | test_ln_s_add linklink foo && |
| 31 | git add bar && |
Junio C Hamano | b45563a | 2007-11-30 22:22:38 -0800 | [diff] [blame] | 32 | git commit -a -m Fourth && |
| 33 | git tag four && |
| 34 | |
| 35 | # This is purely for sanity check |
| 36 | |
Johannes Sixt | 622f98e | 2013-06-07 22:53:32 +0200 | [diff] [blame] | 37 | git rm -f foo bar && |
Junio C Hamano | bfdbee9 | 2008-08-08 02:26:28 -0700 | [diff] [blame] | 38 | cat "$TEST_DIRECTORY"/../COPYING >foo && |
| 39 | cat "$TEST_DIRECTORY"/../Makefile >bar && |
Junio C Hamano | b45563a | 2007-11-30 22:22:38 -0800 | [diff] [blame] | 40 | git add foo bar && |
| 41 | git commit -a -m Fifth && |
| 42 | git tag five && |
| 43 | |
Johannes Sixt | 622f98e | 2013-06-07 22:53:32 +0200 | [diff] [blame] | 44 | git rm -f foo bar && |
Junio C Hamano | bfdbee9 | 2008-08-08 02:26:28 -0700 | [diff] [blame] | 45 | cat "$TEST_DIRECTORY"/../Makefile >foo && |
| 46 | cat "$TEST_DIRECTORY"/../COPYING >bar && |
Junio C Hamano | b45563a | 2007-11-30 22:22:38 -0800 | [diff] [blame] | 47 | git add foo bar && |
| 48 | git commit -a -m Sixth && |
| 49 | git tag six |
| 50 | |
| 51 | ' |
| 52 | |
Johannes Sixt | 622f98e | 2013-06-07 22:53:32 +0200 | [diff] [blame] | 53 | test_expect_success 'cross renames to be detected for regular files' ' |
Junio C Hamano | b45563a | 2007-11-30 22:22:38 -0800 | [diff] [blame] | 54 | |
| 55 | git diff-tree five six -r --name-status -B -M | sort >actual && |
| 56 | { |
| 57 | echo "R100 foo bar" |
| 58 | echo "R100 bar foo" |
| 59 | } | sort >expect && |
Jeff King | 82ebb0b | 2008-03-12 17:36:36 -0400 | [diff] [blame] | 60 | test_cmp expect actual |
Junio C Hamano | b45563a | 2007-11-30 22:22:38 -0800 | [diff] [blame] | 61 | |
| 62 | ' |
| 63 | |
Johannes Sixt | 622f98e | 2013-06-07 22:53:32 +0200 | [diff] [blame] | 64 | test_expect_success 'cross renames to be detected for typechange' ' |
Junio C Hamano | b45563a | 2007-11-30 22:22:38 -0800 | [diff] [blame] | 65 | |
| 66 | git diff-tree one two -r --name-status -B -M | sort >actual && |
| 67 | { |
| 68 | echo "R100 foo bar" |
| 69 | echo "R100 bar foo" |
| 70 | } | sort >expect && |
Jeff King | 82ebb0b | 2008-03-12 17:36:36 -0400 | [diff] [blame] | 71 | test_cmp expect actual |
Junio C Hamano | b45563a | 2007-11-30 22:22:38 -0800 | [diff] [blame] | 72 | |
| 73 | ' |
| 74 | |
Johannes Sixt | 622f98e | 2013-06-07 22:53:32 +0200 | [diff] [blame] | 75 | test_expect_success 'moves and renames' ' |
Junio C Hamano | b45563a | 2007-11-30 22:22:38 -0800 | [diff] [blame] | 76 | |
| 77 | git diff-tree three four -r --name-status -B -M | sort >actual && |
| 78 | { |
Junio C Hamano | 6936b58 | 2014-10-23 10:02:02 -0700 | [diff] [blame] | 79 | # see -B -M (#6) in t4008 |
| 80 | echo "C100 foo bar" |
Junio C Hamano | b45563a | 2007-11-30 22:22:38 -0800 | [diff] [blame] | 81 | echo "T100 foo" |
| 82 | } | sort >expect && |
Jeff King | 82ebb0b | 2008-03-12 17:36:36 -0400 | [diff] [blame] | 83 | test_cmp expect actual |
Junio C Hamano | b45563a | 2007-11-30 22:22:38 -0800 | [diff] [blame] | 84 | |
| 85 | ' |
| 86 | |
| 87 | test_done |