mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-10-19 14:08:16 +02:00
Code

Merge branch 'hv/submodule-update-nuke-submodules' into maint

Browse Source 
"git add" allows adding a regular file to the path where a submodule
used to exist, but "git update-index" did not allow an equivalent
operation to Porcelain writers.

* hv/submodule-update-nuke-submodules:
  update-index: allow overwriting existing submodule index entries
This commit is contained in:
Junio C Hamano 2012-07-11 12:46:31 -07:00
commit a101eb41fb
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))
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);
}