diff options
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/add.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/builtin/add.c b/builtin/add.c index 8ea9cae0e7..09c3fad632 100644 --- a/builtin/add.c +++ b/builtin/add.c @@ -94,6 +94,10 @@ static void update_callback(struct diff_queue_struct *q, for (i = 0; i < q->nr; i++) { struct diff_filepair *p = q->queue[i]; const char *path = p->one->path; + + if (!path_in_sparse_checkout(path, &the_index)) + continue; + switch (fix_unmerged_status(p, data)) { default: die(_("unexpected diff status %c"), p->status); |