Junio C Hamano | 15d061b | 2005-05-27 15:55:55 -0700 | [diff] [blame] | 1 | #!/bin/sh |
| 2 | # |
| 3 | # Copyright (c) 2005 Junio C Hamano |
| 4 | # |
| 5 | |
| 6 | test_description='Rename interaction with pathspec. |
| 7 | |
| 8 | ' |
| 9 | . ./test-lib.sh |
Junio C Hamano | edb0c72 | 2005-05-31 14:47:25 -0700 | [diff] [blame] | 10 | . ../diff-lib.sh ;# test-lib chdir's into trash |
Junio C Hamano | 15d061b | 2005-05-27 15:55:55 -0700 | [diff] [blame] | 11 | |
| 12 | test_expect_success \ |
| 13 | 'prepare reference tree' \ |
| 14 | 'mkdir path0 path1 && |
| 15 | cp ../../COPYING path0/COPYING && |
Junio C Hamano | 215a7ad | 2005-09-07 17:26:23 -0700 | [diff] [blame] | 16 | git-update-index --add path0/COPYING && |
Junio C Hamano | 15d061b | 2005-05-27 15:55:55 -0700 | [diff] [blame] | 17 | tree=$(git-write-tree) && |
| 18 | echo $tree' |
| 19 | |
| 20 | test_expect_success \ |
| 21 | 'prepare work tree' \ |
| 22 | 'cp path0/COPYING path1/COPYING && |
Junio C Hamano | 215a7ad | 2005-09-07 17:26:23 -0700 | [diff] [blame] | 23 | git-update-index --add --remove path0/COPYING path1/COPYING' |
Junio C Hamano | 15d061b | 2005-05-27 15:55:55 -0700 | [diff] [blame] | 24 | |
| 25 | # In the tree, there is only path0/COPYING. In the cache, path0 and |
| 26 | # path1 both have COPYING and the latter is a copy of path0/COPYING. |
| 27 | # Comparing the full tree with cache should tell us so. |
| 28 | |
Junio C Hamano | 215a7ad | 2005-09-07 17:26:23 -0700 | [diff] [blame] | 29 | git-diff-index -C --find-copies-harder $tree >current |
Junio C Hamano | 15d061b | 2005-05-27 15:55:55 -0700 | [diff] [blame] | 30 | |
| 31 | cat >expected <<\EOF |
| 32 | :100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 6ff87c4664981e4397625791c8ea3bbb5f2279a3 C100 path0/COPYING path1/COPYING |
| 33 | EOF |
| 34 | |
| 35 | test_expect_success \ |
Junio C Hamano | 6145ee8 | 2005-05-27 15:56:17 -0700 | [diff] [blame] | 36 | 'validate the result (#1)' \ |
Junio C Hamano | 15d061b | 2005-05-27 15:55:55 -0700 | [diff] [blame] | 37 | 'compare_diff_raw current expected' |
| 38 | |
| 39 | # In the tree, there is only path0/COPYING. In the cache, path0 and |
| 40 | # path1 both have COPYING and the latter is a copy of path0/COPYING. |
Junio C Hamano | 6145ee8 | 2005-05-27 15:56:17 -0700 | [diff] [blame] | 41 | # However when we say we care only about path1, we should just see |
| 42 | # path1/COPYING suddenly appearing from nowhere, not detected as |
| 43 | # a copy from path0/COPYING. |
Junio C Hamano | 15d061b | 2005-05-27 15:55:55 -0700 | [diff] [blame] | 44 | |
Junio C Hamano | 215a7ad | 2005-09-07 17:26:23 -0700 | [diff] [blame] | 45 | git-diff-index -C $tree path1 >current |
Junio C Hamano | 15d061b | 2005-05-27 15:55:55 -0700 | [diff] [blame] | 46 | |
| 47 | cat >expected <<\EOF |
Junio C Hamano | 2bbcdde | 2005-07-26 00:22:43 -0700 | [diff] [blame] | 48 | :000000 100644 0000000000000000000000000000000000000000 6ff87c4664981e4397625791c8ea3bbb5f2279a3 A path1/COPYING |
Junio C Hamano | 15d061b | 2005-05-27 15:55:55 -0700 | [diff] [blame] | 49 | EOF |
| 50 | |
| 51 | test_expect_success \ |
Junio C Hamano | 6145ee8 | 2005-05-27 15:56:17 -0700 | [diff] [blame] | 52 | 'validate the result (#2)' \ |
Junio C Hamano | 15d061b | 2005-05-27 15:55:55 -0700 | [diff] [blame] | 53 | 'compare_diff_raw current expected' |
| 54 | |
| 55 | test_expect_success \ |
| 56 | 'tweak work tree' \ |
| 57 | 'rm -f path0/COPYING && |
Junio C Hamano | 215a7ad | 2005-09-07 17:26:23 -0700 | [diff] [blame] | 58 | git-update-index --remove path0/COPYING' |
Junio C Hamano | 15d061b | 2005-05-27 15:55:55 -0700 | [diff] [blame] | 59 | |
| 60 | # In the tree, there is only path0/COPYING. In the cache, path0 does |
| 61 | # not have COPYING anymore and path1 has COPYING which is a copy of |
| 62 | # path0/COPYING. Showing the full tree with cache should tell us about |
| 63 | # the rename. |
| 64 | |
Junio C Hamano | 215a7ad | 2005-09-07 17:26:23 -0700 | [diff] [blame] | 65 | git-diff-index -C $tree >current |
Junio C Hamano | 15d061b | 2005-05-27 15:55:55 -0700 | [diff] [blame] | 66 | |
| 67 | cat >expected <<\EOF |
| 68 | :100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 6ff87c4664981e4397625791c8ea3bbb5f2279a3 R100 path0/COPYING path1/COPYING |
| 69 | EOF |
| 70 | |
| 71 | test_expect_success \ |
Junio C Hamano | 6145ee8 | 2005-05-27 15:56:17 -0700 | [diff] [blame] | 72 | 'validate the result (#3)' \ |
Junio C Hamano | 15d061b | 2005-05-27 15:55:55 -0700 | [diff] [blame] | 73 | 'compare_diff_raw current expected' |
| 74 | |
| 75 | # In the tree, there is only path0/COPYING. In the cache, path0 does |
| 76 | # not have COPYING anymore and path1 has COPYING which is a copy of |
Junio C Hamano | 6145ee8 | 2005-05-27 15:56:17 -0700 | [diff] [blame] | 77 | # path0/COPYING. When we say we care only about path1, we should just |
| 78 | # see path1/COPYING appearing from nowhere. |
Junio C Hamano | 15d061b | 2005-05-27 15:55:55 -0700 | [diff] [blame] | 79 | |
Junio C Hamano | 215a7ad | 2005-09-07 17:26:23 -0700 | [diff] [blame] | 80 | git-diff-index -C $tree path1 >current |
Junio C Hamano | 15d061b | 2005-05-27 15:55:55 -0700 | [diff] [blame] | 81 | |
| 82 | cat >expected <<\EOF |
Junio C Hamano | 2bbcdde | 2005-07-26 00:22:43 -0700 | [diff] [blame] | 83 | :000000 100644 0000000000000000000000000000000000000000 6ff87c4664981e4397625791c8ea3bbb5f2279a3 A path1/COPYING |
Junio C Hamano | 15d061b | 2005-05-27 15:55:55 -0700 | [diff] [blame] | 84 | EOF |
| 85 | |
| 86 | test_expect_success \ |
Junio C Hamano | 6145ee8 | 2005-05-27 15:56:17 -0700 | [diff] [blame] | 87 | 'validate the result (#4)' \ |
Junio C Hamano | 15d061b | 2005-05-27 15:55:55 -0700 | [diff] [blame] | 88 | 'compare_diff_raw current expected' |
| 89 | |
| 90 | test_done |