Skip to content

Commit

Permalink
update-index: allow overwriting existing submodule index entries
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Heiko Voigt authored and Junio C Hamano committed Jun 11, 2012
1 parent 121f71f commit 242f55f
Showing 1 changed file with 0 additions and 6 deletions.
6 changes: 0 additions & 6 deletions builtin/update-index.c
Original file line number Diff line number Diff line change
Expand Up @@ -211,12 +211,6 @@ static int process_path(const char *path)
if (S_ISDIR(st.st_mode))
return process_directory(path, len, &st);

/*
* Process a regular file
*/
if (ce && S_ISGITLINK(ce->ce_mode))
return error("%s is already a gitlink, not replacing", path);

return add_one_path(ce, path, len, &st);
}

Expand Down

0 comments on commit 242f55f

Please sign in to comment.