mirror of
https://github.com/git/git.git
synced 2024-11-01 14:57:52 +01:00
6aba117d5c
Let's say you have the following three trees, where Base is from one commit
behind either master or branch:
Base : bar_v1, foo/{file1, file2, file3}
branch: bar_v2, foo/{file1, file2}, goo/file3
master: bar_v3, foo/{file1, file2, file3}
Using git-am (or am-based rebase) to apply the changes from branch onto
master results in the following tree:
Result: bar_merged, goo/{file1, file2, file3}
This is not what users want; they did not rename foo/ -> goo/, they only
renamed one file within that directory. The reason this happens is am
constructs fake trees (via build_fake_ancestor()) of the following form:
Base_bfa : bar_v1, foo/file3
branch_bfa: bar_v2, goo/file3
Combining these two trees with master's tree:
master: bar_v3, foo/{file1, file2, file3},
You can see that merge_recursive_generic() would see branch_bfa as renaming
foo/ -> goo/, and master as just adding both foo/file1 and foo/file2. As
such, it ends up with goo/{file1, file2, file3}
The core problem is that am does not have access to the original trees; it
can only construct trees using the blobs involved in the patch. As such,
it is not safe to perform directory rename detection within am -3.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
213 lines
3.9 KiB
Bash
Executable file
213 lines
3.9 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='git rebase + directory rename tests'
|
|
|
|
. ./test-lib.sh
|
|
. "$TEST_DIRECTORY"/lib-rebase.sh
|
|
|
|
test_expect_success 'setup testcase where directory rename should be detected' '
|
|
test_create_repo dir-rename &&
|
|
(
|
|
cd dir-rename &&
|
|
|
|
mkdir x &&
|
|
test_seq 1 10 >x/a &&
|
|
test_seq 11 20 >x/b &&
|
|
test_seq 21 30 >x/c &&
|
|
test_write_lines a b c d e f g h i >l &&
|
|
git add x l &&
|
|
git commit -m "Initial" &&
|
|
|
|
git branch O &&
|
|
git branch A &&
|
|
git branch B &&
|
|
|
|
git checkout A &&
|
|
git mv x y &&
|
|
git mv l letters &&
|
|
git commit -m "Rename x to y, l to letters" &&
|
|
|
|
git checkout B &&
|
|
echo j >>l &&
|
|
test_seq 31 40 >x/d &&
|
|
git add l x/d &&
|
|
git commit -m "Modify l, add x/d"
|
|
)
|
|
'
|
|
|
|
test_expect_success 'rebase --interactive: directory rename detected' '
|
|
(
|
|
cd dir-rename &&
|
|
|
|
git checkout B^0 &&
|
|
|
|
set_fake_editor &&
|
|
FAKE_LINES="1" git rebase --interactive A &&
|
|
|
|
git ls-files -s >out &&
|
|
test_line_count = 5 out &&
|
|
|
|
test_path_is_file y/d &&
|
|
test_path_is_missing x/d
|
|
)
|
|
'
|
|
|
|
test_expect_failure 'rebase (am): directory rename detected' '
|
|
(
|
|
cd dir-rename &&
|
|
|
|
git checkout B^0 &&
|
|
|
|
git rebase A &&
|
|
|
|
git ls-files -s >out &&
|
|
test_line_count = 5 out &&
|
|
|
|
test_path_is_file y/d &&
|
|
test_path_is_missing x/d
|
|
)
|
|
'
|
|
|
|
test_expect_success 'rebase --merge: directory rename detected' '
|
|
(
|
|
cd dir-rename &&
|
|
|
|
git checkout B^0 &&
|
|
|
|
git rebase --merge A &&
|
|
|
|
git ls-files -s >out &&
|
|
test_line_count = 5 out &&
|
|
|
|
test_path_is_file y/d &&
|
|
test_path_is_missing x/d
|
|
)
|
|
'
|
|
|
|
test_expect_failure 'am: directory rename detected' '
|
|
(
|
|
cd dir-rename &&
|
|
|
|
git checkout A^0 &&
|
|
|
|
git format-patch -1 B &&
|
|
|
|
git am --3way 0001*.patch &&
|
|
|
|
git ls-files -s >out &&
|
|
test_line_count = 5 out &&
|
|
|
|
test_path_is_file y/d &&
|
|
test_path_is_missing x/d
|
|
)
|
|
'
|
|
|
|
test_expect_success 'setup testcase where directory rename should NOT be detected' '
|
|
test_create_repo no-dir-rename &&
|
|
(
|
|
cd no-dir-rename &&
|
|
|
|
mkdir x &&
|
|
test_seq 1 10 >x/a &&
|
|
test_seq 11 20 >x/b &&
|
|
test_seq 21 30 >x/c &&
|
|
echo original >project_info &&
|
|
git add x project_info &&
|
|
git commit -m "Initial" &&
|
|
|
|
git branch O &&
|
|
git branch A &&
|
|
git branch B &&
|
|
|
|
git checkout A &&
|
|
echo v2 >project_info &&
|
|
git add project_info &&
|
|
git commit -m "Modify project_info" &&
|
|
|
|
git checkout B &&
|
|
mkdir y &&
|
|
git mv x/c y/c &&
|
|
echo v1 >project_info &&
|
|
git add project_info &&
|
|
git commit -m "Rename x/c to y/c, modify project_info"
|
|
)
|
|
'
|
|
|
|
test_expect_success 'rebase --interactive: NO directory rename' '
|
|
test_when_finished "git -C no-dir-rename rebase --abort" &&
|
|
(
|
|
cd no-dir-rename &&
|
|
|
|
git checkout B^0 &&
|
|
|
|
set_fake_editor &&
|
|
test_must_fail env FAKE_LINES="1" git rebase --interactive A &&
|
|
|
|
git ls-files -s >out &&
|
|
test_line_count = 6 out &&
|
|
|
|
test_path_is_file x/a &&
|
|
test_path_is_file x/b &&
|
|
test_path_is_missing x/c
|
|
)
|
|
'
|
|
|
|
test_expect_success 'rebase (am): NO directory rename' '
|
|
test_when_finished "git -C no-dir-rename rebase --abort" &&
|
|
(
|
|
cd no-dir-rename &&
|
|
|
|
git checkout B^0 &&
|
|
|
|
set_fake_editor &&
|
|
test_must_fail git rebase A &&
|
|
|
|
git ls-files -s >out &&
|
|
test_line_count = 6 out &&
|
|
|
|
test_path_is_file x/a &&
|
|
test_path_is_file x/b &&
|
|
test_path_is_missing x/c
|
|
)
|
|
'
|
|
|
|
test_expect_success 'rebase --merge: NO directory rename' '
|
|
test_when_finished "git -C no-dir-rename rebase --abort" &&
|
|
(
|
|
cd no-dir-rename &&
|
|
|
|
git checkout B^0 &&
|
|
|
|
set_fake_editor &&
|
|
test_must_fail git rebase --merge A &&
|
|
|
|
git ls-files -s >out &&
|
|
test_line_count = 6 out &&
|
|
|
|
test_path_is_file x/a &&
|
|
test_path_is_file x/b &&
|
|
test_path_is_missing x/c
|
|
)
|
|
'
|
|
|
|
test_expect_success 'am: NO directory rename' '
|
|
test_when_finished "git -C no-dir-rename am --abort" &&
|
|
(
|
|
cd no-dir-rename &&
|
|
|
|
git checkout A^0 &&
|
|
|
|
git format-patch -1 B &&
|
|
|
|
test_must_fail git am --3way 0001*.patch &&
|
|
|
|
git ls-files -s >out &&
|
|
test_line_count = 6 out &&
|
|
|
|
test_path_is_file x/a &&
|
|
test_path_is_file x/b &&
|
|
test_path_is_missing x/c
|
|
)
|
|
'
|
|
|
|
test_done
|