diff options
| author |  Brad King <brad.king@kitware.com> | 2010-01-08 22:36:41 -0500 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-01-09 23:43:22 -0800 |
| commit | 40c813e00c8de5725c7a6bb127fadedcce1f788f (patch) | |
| tree | f32db8685fc9f12f07f05b9a8440d8d64791d64d /t/t2104-update-index-gitfile.sh | |
| parent | Test update-index for a gitlink to a .git file (diff) | |
| download | tgif-40c813e00c8de5725c7a6bb127fadedcce1f788f.tar.xz | |
Handle relative paths in submodule .git files
Commit 842abf0 (Teach resolve_gitlink_ref() about the .git file, 2008-02-20)
taught resolve_gitlink_ref() to call read_gitfile_gently() to resolve .git
files. In this commit teach read_gitfile_gently() to interpret a relative
path in a .git file with respect to the file location.
This change allows update-index to recognize a submodule that uses a relative
path in its .git file. It previously failed because the relative path was
wrongly interpreted with respect to the superproject directory.
Signed-off-by: Brad King <brad.king@kitware.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t2104-update-index-gitfile.sh')
| -rwxr-xr-x | t/t2104-update-index-gitfile.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t2104-update-index-gitfile.sh b/t/t2104-update-index-gitfile.sh index ba719846a6..641607d89a 100755 --- a/t/t2104-update-index-gitfile.sh +++ b/t/t2104-update-index-gitfile.sh @@ -31,7 +31,7 @@ test_expect_success 'submodule with relative .git file' ' test_commit first) ' -test_expect_failure 'add gitlink to relative .git file' ' +test_expect_success 'add gitlink to relative .git file' ' git update-index --add -- sub2 ' |