Skip to content

Commit 242f55f

Browse files
hvoigtgitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 121f71f commit 242f55f

File tree

1 file changed

+0
-6
lines changed

1 file changed

+0
-6
lines changed

builtin/update-index.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -211,12 +211,6 @@ static int process_path(const char *path)
211211
if (S_ISDIR(st.st_mode))
212212
return process_directory(path, len, &st);
213213

214-
/*
215-
* Process a regular file
216-
*/
217-
if (ce && S_ISGITLINK(ce->ce_mode))
218-
return error("%s is already a gitlink, not replacing", path);
219-
220214
return add_one_path(ce, path, len, &st);
221215
}
222216

0 commit comments

Comments
 (0)