diff options
| author | Adam Spiers <git@adamspiers.org> | 2013-01-06 16:58:10 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-01-06 14:26:37 -0800 |
| commit | 9d67b61f739a1a898bc8c9960047ebff0e9c9d09 (patch) | |
| tree | 654d54363d4c5d27f333f2b55af4ba2c8eb502fe /builtin/add.c | |
| parent | 4b78d7bccdda25290ab6c04bf45d835b4fdfab45 (diff) | |
| download | git-9d67b61f739a1a898bc8c9960047ebff0e9c9d09.tar.gz git-9d67b61f739a1a898bc8c9960047ebff0e9c9d09.tar.xz | |
add.c: extract check_path_for_gitlink() from treat_gitlinks() for reuse
Extract the body of the for loop in treat_gitlinks() into a separate
check_path_for_gitlink() function so that it can be reused elsewhere.
This paves the way for a new check-ignore sub-command.
Also document treat_gitlinks().
Signed-off-by: Adam Spiers <git@adamspiers.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/add.c')
| -rw-r--r-- | builtin/add.c | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/builtin/add.c b/builtin/add.c index 8c3fdf943..f95ded256 100644 --- a/builtin/add.c +++ b/builtin/add.c @@ -121,6 +121,10 @@ static char *prune_directory(struct dir_struct *dir, const char **pathspec, int return seen; } +/* + * Checks the index to see whether any path in pathspec refers to + * something inside a submodule. If so, dies with an error message. + */ static void treat_gitlinks(const char **pathspec) { int i; @@ -128,24 +132,8 @@ static void treat_gitlinks(const char **pathspec) 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); - } - } - } + for (i = 0; pathspec[i]; i++) + pathspec[i] = check_path_for_gitlink(pathspec[i]); } static void refresh(int verbose, const char **pathspec) |