mirror of
https://github.com/git/git.git
synced 2024-11-16 06:03:44 +01:00
90a6464b4a
The git-new-workdir script in contrib/ makes a new work tree by sharing many subdirectories of the .git directory with the original repository. When rerere.enabled is set in the original repository, but the user has not encountered any conflicts yet, the original repository may not yet have .git/rr-cache directory. When rerere wants to run in a new work tree created from such a young original repository, it fails to mkdir(2) .git/rr-cache that is a symlink to a yet-to-be-created directory. There are three possible approaches to this: - A naive solution is not to create a symlink in the git-new-workdir script to a directory the original does not have (yet). This is not a solution, as we tend to lazily create subdirectories of .git/, and having rerere.enabled configuration set is a strong indication that the user _wants_ to have this lazy creation to happen; - We could always create .git/rr-cache upon repository creation. This is tempting but will not help people with existing repositories. - Detect this case by seeing that mkdir(2) failed with EEXIST, checking that the path is a symlink, and try running mkdir(2) on the link target. This patch solves the issue by doing the third one. Strictly speaking, this is incomplete. It does not attempt to handle relative symbolic link that points into the original repository, but this is good enough to help people who use contrib/workdir/git-new-workdir script. Signed-off-by: Junio C Hamano <gitster@pobox.com>
55 lines
1.3 KiB
Bash
Executable file
55 lines
1.3 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='rerere run in a workdir'
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success SYMLINKS setup '
|
|
git config rerere.enabled true &&
|
|
>world &&
|
|
git add world &&
|
|
test_tick &&
|
|
git commit -m initial &&
|
|
|
|
echo hello >world &&
|
|
test_tick &&
|
|
git commit -a -m hello &&
|
|
|
|
git checkout -b side HEAD^ &&
|
|
echo goodbye >world &&
|
|
test_tick &&
|
|
git commit -a -m goodbye &&
|
|
|
|
git checkout master
|
|
'
|
|
|
|
test_expect_success SYMLINKS 'rerere in workdir' '
|
|
rm -rf .git/rr-cache &&
|
|
"$SHELL_PATH" "$TEST_DIRECTORY/../contrib/workdir/git-new-workdir" . work &&
|
|
(
|
|
cd work &&
|
|
test_must_fail git merge side &&
|
|
git rerere status >actual &&
|
|
echo world >expect &&
|
|
test_cmp expect actual
|
|
)
|
|
'
|
|
|
|
# This fails because we don't resolve relative symlink in mkdir_in_gitdir()
|
|
# For the purpose of helping contrib/workdir/git-new-workdir users, we do not
|
|
# have to support relative symlinks, but it might be nicer to make this work
|
|
# with a relative symbolic link someday.
|
|
test_expect_failure SYMLINKS 'rerere in workdir (relative)' '
|
|
rm -rf .git/rr-cache &&
|
|
"$SHELL_PATH" "$TEST_DIRECTORY/../contrib/workdir/git-new-workdir" . krow &&
|
|
(
|
|
cd krow &&
|
|
rm -f .git/rr-cache &&
|
|
ln -s ../.git/rr-cache .git/rr-cache &&
|
|
test_must_fail git merge side &&
|
|
git rerere status >actual &&
|
|
echo world >expect &&
|
|
test_cmp expect actual
|
|
)
|
|
'
|
|
|
|
test_done
|