diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-12-16 22:33:40 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-16 22:33:40 -0800 |
| commit | 48b303675aa238c209e527feadcbb7ba1c025c97 (patch) | |
| tree | 6a48f4388867f836db0e4c015098348079a9185d /builtin/add.c | |
| parent | e45c9b03c32620c444f464403c23534160998624 (diff) | |
| parent | 568508e76570e9ea36aad6446959424cebcf0535 (diff) | |
| download | git-48b303675aa238c209e527feadcbb7ba1c025c97.tar.gz | |
Merge branch 'jc/stream-to-pack'
* jc/stream-to-pack:
bulk-checkin: replace fast-import based implementation
csum-file: introduce sha1file_checkpoint
finish_tmp_packfile(): a helper function
create_tmp_packfile(): a helper function
write_pack_header(): a helper function
Conflicts:
pack.h
Diffstat (limited to 'builtin/add.c')
| -rw-r--r-- | builtin/add.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/builtin/add.c b/builtin/add.c index c59b0c98fe..1c42900ff8 100644 --- a/builtin/add.c +++ b/builtin/add.c @@ -13,6 +13,7 @@ #include "diff.h" #include "diffcore.h" #include "revision.h" +#include "bulk-checkin.h" static const char * const builtin_add_usage[] = { "git add [options] [--] <filepattern>...", @@ -458,11 +459,15 @@ int cmd_add(int argc, const char **argv, const char *prefix) free(seen); } + plug_bulk_checkin(); + exit_status |= add_files_to_cache(prefix, pathspec, flags); if (add_new_files) exit_status |= add_files(&dir, flags); + unplug_bulk_checkin(); + finish: if (active_cache_changed) { if (write_cache(newfd, active_cache, active_nr) || |