]>
Commit | Line | Data |
---|---|---|
6f6826c5 JS |
1 | #!/bin/sh |
2 | ||
3 | test_description='git-filter-branch' | |
4 | . ./test-lib.sh | |
5 | ||
6 | make_commit () { | |
7 | lower=$(echo $1 | tr A-Z a-z) | |
8 | echo $lower > $lower | |
9 | git add $lower | |
aee078bf | 10 | test_tick |
6f6826c5 JS |
11 | git commit -m $1 |
12 | git tag $1 | |
13 | } | |
14 | ||
15 | test_expect_success 'setup' ' | |
16 | make_commit A | |
17 | make_commit B | |
18 | git checkout -b branch B | |
19 | make_commit D | |
20 | make_commit E | |
21 | git checkout master | |
22 | make_commit C | |
23 | git checkout branch | |
24 | git merge C | |
25 | git tag F | |
26 | make_commit G | |
27 | make_commit H | |
28 | ' | |
29 | ||
5be60078 | 30 | H=$(git rev-parse H) |
6f6826c5 JS |
31 | |
32 | test_expect_success 'rewrite identically' ' | |
33 | git-filter-branch H2 | |
34 | ' | |
35 | ||
36 | test_expect_success 'result is really identical' ' | |
5be60078 | 37 | test $H = $(git rev-parse H2) |
6f6826c5 JS |
38 | ' |
39 | ||
40 | test_expect_success 'rewrite, renaming a specific file' ' | |
41 | git-filter-branch --tree-filter "mv d doh || :" H3 | |
42 | ' | |
43 | ||
44 | test_expect_success 'test that the file was renamed' ' | |
45 | test d = $(git show H3:doh) | |
46 | ' | |
47 | ||
98409060 JS |
48 | git tag oldD H3~4 |
49 | test_expect_success 'rewrite one branch, keeping a side branch' ' | |
2766ce28 | 50 | git-filter-branch --tree-filter "mv b boh || :" modD D..oldD |
98409060 JS |
51 | ' |
52 | ||
53 | test_expect_success 'common ancestor is still common (unchanged)' ' | |
5be60078 | 54 | test "$(git merge-base modD D)" = "$(git rev-parse B)" |
98409060 JS |
55 | ' |
56 | ||
685ef546 JS |
57 | test_expect_success 'filter subdirectory only' ' |
58 | mkdir subdir && | |
59 | touch subdir/new && | |
60 | git add subdir/new && | |
61 | test_tick && | |
62 | git commit -m "subdir" && | |
63 | echo H > a && | |
64 | test_tick && | |
65 | git commit -m "not subdir" a && | |
66 | echo A > subdir/new && | |
67 | test_tick && | |
68 | git commit -m "again subdir" subdir/new && | |
69 | git rm a && | |
70 | test_tick && | |
71 | git commit -m "again not subdir" && | |
72 | git-filter-branch --subdirectory-filter subdir sub | |
73 | ' | |
74 | ||
75 | test_expect_success 'subdirectory filter result looks okay' ' | |
5be60078 | 76 | test 2 = $(git rev-list sub | wc -l) && |
685ef546 JS |
77 | git show sub:new && |
78 | ! git show sub:subdir | |
79 | ' | |
80 | ||
cfabd6ee JS |
81 | test_expect_success 'setup and filter history that requires --full-history' ' |
82 | git checkout master && | |
83 | mkdir subdir && | |
84 | echo A > subdir/new && | |
85 | git add subdir/new && | |
86 | test_tick && | |
87 | git commit -m "subdir on master" subdir/new && | |
88 | git rm a && | |
89 | test_tick && | |
90 | git commit -m "again subdir on master" && | |
91 | git merge branch && | |
92 | git-filter-branch --subdirectory-filter subdir sub-master | |
93 | ' | |
94 | ||
95 | test_expect_success 'subdirectory filter result looks okay' ' | |
5be60078 | 96 | test 3 = $(git rev-list -1 --parents sub-master | wc -w) && |
cfabd6ee JS |
97 | git show sub-master^:new && |
98 | git show sub-master^2:new && | |
99 | ! git show sub:subdir | |
100 | ' | |
101 | ||
55f22ff2 JS |
102 | test_expect_success 'use index-filter to move into a subdirectory' ' |
103 | git-filter-branch --index-filter \ | |
5be60078 | 104 | "git ls-files -s | sed \"s-\\t-&newsubdir/-\" | |
55f22ff2 | 105 | GIT_INDEX_FILE=\$GIT_INDEX_FILE.new \ |
5be60078 | 106 | git update-index --index-info && |
55f22ff2 JS |
107 | mv \$GIT_INDEX_FILE.new \$GIT_INDEX_FILE" directorymoved && |
108 | test -z "$(git diff HEAD directorymoved:newsubdir)"' | |
109 | ||
6f6826c5 | 110 | test_done |