mirror of
https://github.com/git/git.git
synced 2024-11-18 16:43:49 +01:00
2766ce2815
A subset of commits in a branch used to be specified by options (-k, -r) as well as the branch tip itself (-s). It is more natural (for git users) to specify revision ranges like 'master..next' instead. This makes it so. If no range is specified it defaults to 'HEAD'. As a consequence, the new name of the filtered branch must be the first non-option argument. All remaining arguments are passed to 'git rev-list' unmodified. The tip of the branch that gets filtered is implied: It is the first commit that git rev-list would print for the specified range. Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at> Acked-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
58 lines
1.1 KiB
Bash
Executable File
58 lines
1.1 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='git-filter-branch'
|
|
. ./test-lib.sh
|
|
|
|
make_commit () {
|
|
lower=$(echo $1 | tr A-Z a-z)
|
|
echo $lower > $lower
|
|
git add $lower
|
|
test_tick
|
|
git commit -m $1
|
|
git tag $1
|
|
}
|
|
|
|
test_expect_success 'setup' '
|
|
make_commit A
|
|
make_commit B
|
|
git checkout -b branch B
|
|
make_commit D
|
|
make_commit E
|
|
git checkout master
|
|
make_commit C
|
|
git checkout branch
|
|
git merge C
|
|
git tag F
|
|
make_commit G
|
|
make_commit H
|
|
'
|
|
|
|
H=$(git-rev-parse H)
|
|
|
|
test_expect_success 'rewrite identically' '
|
|
git-filter-branch H2
|
|
'
|
|
|
|
test_expect_success 'result is really identical' '
|
|
test $H = $(git-rev-parse H2)
|
|
'
|
|
|
|
test_expect_success 'rewrite, renaming a specific file' '
|
|
git-filter-branch --tree-filter "mv d doh || :" H3
|
|
'
|
|
|
|
test_expect_success 'test that the file was renamed' '
|
|
test d = $(git show H3:doh)
|
|
'
|
|
|
|
git tag oldD H3~4
|
|
test_expect_success 'rewrite one branch, keeping a side branch' '
|
|
git-filter-branch --tree-filter "mv b boh || :" modD D..oldD
|
|
'
|
|
|
|
test_expect_success 'common ancestor is still common (unchanged)' '
|
|
test "$(git-merge-base modD D)" = "$(git-rev-parse B)"
|
|
'
|
|
|
|
test_done
|