| commit | 40c813e00c8de5725c7a6bb127fadedcce1f788f | |
| author | Brad King <brad.king@kitware.com> | |
| Sat, 9 Jan 2010 03:36:41 +0000 (8 22:36 -0500) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 10 Jan 2010 07:43:22 +0000 (9 23:43 -0800) | ||
| tree | f32db8685fc9f12f07f05b9a8440d8d64791d64d | treesnapshot (tar.gz zip) |
| parent | 48cc95ed4a5c4554f8914af3f300558da31a22dc | commitdiff |
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>
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>
| setup.c | diffblobblamehistory | |
| t/t2104-update-index-gitfile.sh | diffblobblamehistory |