diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-08-04 00:51:42 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-08-04 23:31:23 -0700 |
| commit | 806d13b1ccdbdde4bbdfb96902791c4b7ed125f6 (patch) | |
| tree | 139db78f9efdb5f588c1b504b0dc8700d9d9039c /builtin-merge-file.c | |
| parent | fba5279db904aa49bb75bb31614571b9b6d75b33 (diff) | |
| download | git-806d13b1ccdbdde4bbdfb96902791c4b7ed125f6.tar.gz | |
update-index: refuse to add working tree items beyond symlinks
When "sym" is a symbolic link that is inside the working tree, and it
points at a directory "dir" that has "path" in it, "update-index --add
sym/path" used to mistakenly add "sym/path" as if "sym" were a normal
directory.
"git apply", "git diff" and "git merge" have been taught about this issue
some time ago, but "update-index" and "add" have been left ignorant for
too long.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-merge-file.c')
0 files changed, 0 insertions, 0 deletions