diff options
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2009-01-02 19:08:40 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-01-05 10:48:32 -0800 |
| commit | 2ce53f9b77eb36c6d1286f55fba65f8dc66b2564 (patch) | |
| tree | 5a297187f15cc12c71515ba8c3a8a8fb8888a1b5 /builtin-add.c | |
| parent | 8104ebfe8276657ee803cca7eb8665a78cf3ef83 (diff) | |
| download | git-2ce53f9b77eb36c6d1286f55fba65f8dc66b2564.tar.gz git-2ce53f9b77eb36c6d1286f55fba65f8dc66b2564.tar.xz | |
git add: do not add files from a submodule
It comes quite as a surprise to an unsuspecting Git user that calling
"git add submodule/file" (which is a mistake, alright) _removes_
the submodule in the index, and adds the file. Instead, complain loudly.
While at it, be nice when the user said "git add submodule/" which is
most likely the consequence of tab-completion, and stage the submodule,
instead of trying to add the contents of that directory.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-add.c')
| -rw-r--r-- | builtin-add.c | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/builtin-add.c b/builtin-add.c index 719de8b0f..ac98c8354 100644 --- a/builtin-add.c +++ b/builtin-add.c @@ -68,6 +68,33 @@ static void prune_directory(struct dir_struct *dir, const char **pathspec, int p free(seen); } +static void treat_gitlinks(const char **pathspec) +{ + int i; + + if (!pathspec || !*pathspec) + return; + + for (i = 0; i < active_nr; i++) { + struct cache_entry *ce = active_cache[i]; + if (S_ISGITLINK(ce->ce_mode)) { + int len = ce_namelen(ce), j; + for (j = 0; pathspec[j]; j++) { + int len2 = strlen(pathspec[j]); + if (len2 <= len || pathspec[j][len] != '/' || + memcmp(ce->name, pathspec[j], len)) + continue; + if (len2 == len + 1) + /* strip trailing slash */ + pathspec[j] = xstrndup(ce->name, len); + else + die ("Path '%s' is in submodule '%.*s'", + pathspec[j], len, ce->name); + } + } + } +} + static void fill_directory(struct dir_struct *dir, const char **pathspec, int ignored_too) { @@ -261,6 +288,7 @@ int cmd_add(int argc, const char **argv, const char *prefix) if (read_cache() < 0) die("index file corrupt"); + treat_gitlinks(pathspec); if (add_new_files) /* This picks up the paths that are not tracked */ |