diff options
author | Stefan Beller <sbeller@google.com> | 2018-03-23 18:45:21 +0100 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-03-26 10:07:43 -0700 |
commit | a49d2834359a3fa943edf81e2d146fc787bc1cfe (patch) | |
tree | 3dad5b0af21e8dec35638a887141dc1bbb5958e8 /builtin | |
parent | packfile: add repository argument to prepare_packed_git (diff) | |
download | tgif-a49d2834359a3fa943edf81e2d146fc787bc1cfe.tar.xz |
packfile: add repository argument to reprepare_packed_git
See previous patch for explanation.
Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
-rw-r--r-- | builtin/gc.c | 2 | ||||
-rw-r--r-- | builtin/receive-pack.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/builtin/gc.c b/builtin/gc.c index 4c7409946e..a78dad51aa 100644 --- a/builtin/gc.c +++ b/builtin/gc.c @@ -478,7 +478,7 @@ int cmd_gc(int argc, const char **argv, const char *prefix) return error(FAILED_RUN, rerere.argv[0]); report_garbage = report_pack_garbage; - reprepare_packed_git(); + reprepare_packed_git(the_repository); if (pack_garbage.nr > 0) clean_pack_garbage(); diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c index 1a298a6711..469b916707 100644 --- a/builtin/receive-pack.c +++ b/builtin/receive-pack.c @@ -1,4 +1,5 @@ #include "builtin.h" +#include "repository.h" #include "config.h" #include "lockfile.h" #include "pack.h" @@ -1777,7 +1778,7 @@ static const char *unpack(int err_fd, struct shallow_info *si) status = finish_command(&child); if (status) return "index-pack abnormal exit"; - reprepare_packed_git(); + reprepare_packed_git(the_repository); } return NULL; } |