undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update-index: allow overwriting existing submodule index entries

Browse Source 
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>
This commit is contained in:
Heiko Voigt 2012-06-09 16:27:00 +02:00 committed by Junio C Hamano
parent 121f71f0da
commit 242f55f612
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
builtin/update-index.c
View File

@ -211,12 +211,6 @@ static int process_path(const char *path)
if (S_ISDIR(st.st_mode)) if (S_ISDIR(st.st_mode))
return process_directory(path, len, &st); 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); return add_one_path(ce, path, len, &st);
} }