b0f266de11
A patch changing a symlink into a file is written with 2 sections (in
the code, represented as "struct patch"): firstly, the deletion of the
symlink, and secondly, the creation of the file. When applying that
patch with -R, the sections are reversed, so we get:
(1) creation of a symlink, then
(2) deletion of a file.
This causes an issue when the "deletion of a file" section is checked,
because Git observes that the so-called file is not a file but a
symlink, resulting in a "wrong type" error message.
What we want is:
(1) deletion of a file, then
(2) creation of a symlink.
In the code, this is reflected in the behavior of previous_patch() when
invoked from check_preimage() when the deletion is checked. Creation
then deletion means that when the deletion is checked, previous_patch()
returns the creation section, triggering a mode conflict resulting in
the "wrong type" error message. But deletion then creation means that
when the deletion is checked, previous_patch() returns NULL, so the
deletion mode is checked against lstat, which is what we want.
There are also other ways a patch can contain 2 sections referencing the
same file, for example, in 7a07841c0b ("git-apply: handle a patch that
touches the same path more than once better", 2008-06-27). "git apply
-R" fails in the same way, and this commit makes this case succeed.
Therefore, when building the list of sections, build them in reverse
order (by adding to the front of the list instead of the back) when -R
is passed.
Helped-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
130 lines
3.2 KiB
Bash
Executable File
130 lines
3.2 KiB
Bash
Executable File
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2006 Eric Wong
|
|
#
|
|
|
|
test_description='git apply should not get confused with type changes.
|
|
|
|
'
|
|
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success 'setup repository and commits' '
|
|
echo "hello world" > foo &&
|
|
echo "hi planet" > bar &&
|
|
git update-index --add foo bar &&
|
|
git commit -m initial &&
|
|
git branch initial &&
|
|
rm -f foo &&
|
|
test_ln_s_add bar foo &&
|
|
git commit -m "foo symlinked to bar" &&
|
|
git branch foo-symlinked-to-bar &&
|
|
git rm -f foo &&
|
|
echo "how far is the sun?" > foo &&
|
|
git update-index --add foo &&
|
|
git commit -m "foo back to file" &&
|
|
git branch foo-back-to-file &&
|
|
printf "\0" > foo &&
|
|
git update-index foo &&
|
|
git commit -m "foo becomes binary" &&
|
|
git branch foo-becomes-binary &&
|
|
rm -f foo &&
|
|
git update-index --remove foo &&
|
|
mkdir foo &&
|
|
echo "if only I knew" > foo/baz &&
|
|
git update-index --add foo/baz &&
|
|
git commit -m "foo becomes a directory" &&
|
|
git branch "foo-becomes-a-directory" &&
|
|
echo "hello world" > foo/baz &&
|
|
git update-index foo/baz &&
|
|
git commit -m "foo/baz is the original foo" &&
|
|
git branch foo-baz-renamed-from-foo
|
|
'
|
|
|
|
test_expect_success 'file renamed from foo to foo/baz' '
|
|
git checkout -f initial &&
|
|
git diff-tree -M -p HEAD foo-baz-renamed-from-foo > patch &&
|
|
git apply --index < patch
|
|
'
|
|
test_debug 'cat patch'
|
|
|
|
|
|
test_expect_success 'file renamed from foo/baz to foo' '
|
|
git checkout -f foo-baz-renamed-from-foo &&
|
|
git diff-tree -M -p HEAD initial > patch &&
|
|
git apply --index < patch
|
|
'
|
|
test_debug 'cat patch'
|
|
|
|
|
|
test_expect_success 'directory becomes file' '
|
|
git checkout -f foo-becomes-a-directory &&
|
|
git diff-tree -p HEAD initial > patch &&
|
|
git apply --index < patch
|
|
'
|
|
test_debug 'cat patch'
|
|
|
|
|
|
test_expect_success 'file becomes directory' '
|
|
git checkout -f initial &&
|
|
git diff-tree -p HEAD foo-becomes-a-directory > patch &&
|
|
git apply --index < patch
|
|
'
|
|
test_debug 'cat patch'
|
|
|
|
|
|
test_expect_success 'file becomes symlink' '
|
|
git checkout -f initial &&
|
|
git diff-tree -p HEAD foo-symlinked-to-bar > patch &&
|
|
git apply --index < patch
|
|
'
|
|
test_debug 'cat patch'
|
|
|
|
|
|
test_expect_success 'symlink becomes file' '
|
|
git checkout -f foo-symlinked-to-bar &&
|
|
git diff-tree -p HEAD foo-back-to-file > patch &&
|
|
git apply --index < patch
|
|
'
|
|
test_debug 'cat patch'
|
|
|
|
test_expect_success 'symlink becomes file, in reverse' '
|
|
git checkout -f foo-symlinked-to-bar &&
|
|
git diff-tree -p HEAD foo-back-to-file > patch &&
|
|
git checkout foo-back-to-file &&
|
|
git apply -R --index < patch
|
|
'
|
|
|
|
test_expect_success 'binary file becomes symlink' '
|
|
git checkout -f foo-becomes-binary &&
|
|
git diff-tree -p --binary HEAD foo-symlinked-to-bar > patch &&
|
|
git apply --index < patch
|
|
'
|
|
test_debug 'cat patch'
|
|
|
|
test_expect_success 'symlink becomes binary file' '
|
|
git checkout -f foo-symlinked-to-bar &&
|
|
git diff-tree -p --binary HEAD foo-becomes-binary > patch &&
|
|
git apply --index < patch
|
|
'
|
|
test_debug 'cat patch'
|
|
|
|
|
|
test_expect_success 'symlink becomes directory' '
|
|
git checkout -f foo-symlinked-to-bar &&
|
|
git diff-tree -p HEAD foo-becomes-a-directory > patch &&
|
|
git apply --index < patch
|
|
'
|
|
test_debug 'cat patch'
|
|
|
|
|
|
test_expect_success 'directory becomes symlink' '
|
|
git checkout -f foo-becomes-a-directory &&
|
|
git diff-tree -p HEAD foo-symlinked-to-bar > patch &&
|
|
git apply --index < patch
|
|
'
|
|
test_debug 'cat patch'
|
|
|
|
|
|
test_done
|