diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-07-11 12:46:31 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-07-11 12:46:31 -0700 |
| commit | a101eb41fb3319e5f0e2e12206cf2d87aab72f0f (patch) | |
| tree | b41f01afa991e035069c4e239cb2e3063ea048bc /builtin | |
| parent | 95c9eb8fcd4c9a72954c9d16b0d4c653a1f02085 (diff) | |
| parent | 242f55f61252e610092e93f4b2daebba21cb8acf (diff) | |
| download | git-a101eb41fb3319e5f0e2e12206cf2d87aab72f0f.tar.gz git-a101eb41fb3319e5f0e2e12206cf2d87aab72f0f.tar.xz | |
Merge branch 'hv/submodule-update-nuke-submodules' into maint
"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
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/update-index.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/builtin/update-index.c b/builtin/update-index.c index 5f038d64d..5a4e9ea55 100644 --- a/builtin/update-index.c +++ b/builtin/update-index.c @@ -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); } |