| commit | 242f55f61252e610092e93f4b2daebba21cb8acf | |
| author | Heiko Voigt <hvoigt@hvoigt.net> | |
| Sat, 9 Jun 2012 14:27:00 +0000 (9 16:27 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 11 Jun 2012 15:00:11 +0000 (11 08:00 -0700) | ||
| tree | 05f8086bfab70dfd15e2d99fdc4d4d96c5b89c54 | treesnapshot (tar.gz zip) |
| parent | 121f71f0da1bc9a4e1e96be2c3e683191a82a354 | commitdiff |
update-index: allow overwriting existing submodule index entries
In commit e01105 Linus introduced gitlinks to update-index. He explains
that he thinks it is not the right thing to replace a gitlink with
something else.
That commit is from the very first beginnings of submodule support.
Since then we have gotten a lot closer to being able to remove a
submodule without losing its history. This check prevents such a use
case, so I think this assumption has changed.
Additionally in the git add codepath we do not have such a check, so for
consistency reasons I think removing this check is the correct thing to
do.
Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
In commit e01105 Linus introduced gitlinks to update-index. He explains
that he thinks it is not the right thing to replace a gitlink with
something else.
That commit is from the very first beginnings of submodule support.
Since then we have gotten a lot closer to being able to remove a
submodule without losing its history. This check prevents such a use
case, so I think this assumption has changed.
Additionally in the git add codepath we do not have such a check, so for
consistency reasons I think removing this check is the correct thing to
do.
Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| builtin/update-index.c | diffblobblamehistory |