diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-12-25 10:38:35 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-12-25 10:38:35 -0800 |
| commit | 1e423f56558e74a3a94c653108f64f0305199b9a (patch) | |
| tree | 5eeb5c316a6328649f8ace625d2eee51ade12fa9 | |
| parent | git-add: add ignored files when asked explicitly. (diff) | |
| download | tgif-1e423f56558e74a3a94c653108f64f0305199b9a.tar.xz | |
git-add: warn when adding an ignored file with an explicit request.
We allow otherwise ignored paths to be added to the index by
spelling its path out on the command line, but we would warn the
user about them when we do so.
Signed-off-by: Junio C Hamano <junkio@cox.net>
| -rw-r--r-- | builtin-add.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/builtin-add.c b/builtin-add.c index 822075ac22..c54c694532 100644 --- a/builtin-add.c +++ b/builtin-add.c @@ -37,6 +37,9 @@ static void prune_directory(struct dir_struct *dir, const char **pathspec, int p free(entry); continue; } + if (entry->ignored_entry) + fprintf(stderr, "warning: '%s' is an ignored path.\n", + entry->name); *dst++ = entry; } dir->nr = dst - dir->entries; |