about summary refs log tree commit
diff options
context:
space:
mode:
authorStefan Beller <sbeller@google.com>2018-03-23 18:45:21 +0100
committerJunio C Hamano <gitster@pobox.com>2018-03-26 10:07:43 -0700
commita49d2834359a3fa943edf81e2d146fc787bc1cfe (patch)
tree3dad5b0af21e8dec35638a887141dc1bbb5958e8
parent6fdb4e9f5a883aa3d96fc19b3e08d3449d53ea0c (diff)
downloadgit-a49d2834359a3fa943edf81e2d146fc787bc1cfe.tar.gz
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>
-rw-r--r--builtin/gc.c2
-rw-r--r--builtin/receive-pack.c3
-rw-r--r--bulk-checkin.c3
-rw-r--r--fetch-pack.c3
-rw-r--r--packfile.c2
-rw-r--r--packfile.h3
-rw-r--r--sha1_file.c2
7 files changed, 11 insertions, 7 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;
 }
diff --git a/bulk-checkin.c b/bulk-checkin.c
index 3310fd210a..eadc2d5172 100644
--- a/bulk-checkin.c
+++ b/bulk-checkin.c
@@ -3,6 +3,7 @@
  */
 #include "cache.h"
 #include "bulk-checkin.h"
+#include "repository.h"
 #include "csum-file.h"
 #include "pack.h"
 #include "strbuf.h"
@@ -57,7 +58,7 @@ clear_exit:
 
         strbuf_release(&packname);
         /* Make objects we just wrote available to ourselves */
-        reprepare_packed_git();
+        reprepare_packed_git(the_repository);
 }
 
 static int already_written(struct bulk_checkin_state *state, unsigned char sha1[])
diff --git a/fetch-pack.c b/fetch-pack.c
index 8253d746e0..eac5928a27 100644
--- a/fetch-pack.c
+++ b/fetch-pack.c
@@ -1,4 +1,5 @@
 #include "cache.h"
+#include "repository.h"
 #include "config.h"
 #include "lockfile.h"
 #include "refs.h"
@@ -1192,7 +1193,7 @@ struct ref *fetch_pack(struct fetch_pack_args *args,
         prepare_shallow_info(&si, shallow);
         ref_cpy = do_fetch_pack(args, fd, ref, sought, nr_sought,
                                 &si, pack_lockfile);
-        reprepare_packed_git();
+        reprepare_packed_git(the_repository);
         update_shallow(args, sought, nr_sought, &si);
         clear_shallow_info(&si);
         return ref_cpy;
diff --git a/packfile.c b/packfile.c
index 6b2c86c5e0..210fcb3db4 100644
--- a/packfile.c
+++ b/packfile.c
@@ -899,7 +899,7 @@ void prepare_packed_git_the_repository(void)
         the_repository->objects->packed_git_initialized = 1;
 }
 
-void reprepare_packed_git(void)
+void reprepare_packed_git_the_repository(void)
 {
         the_repository->objects->approximate_object_count_valid = 0;
         the_repository->objects->packed_git_initialized = 0;
diff --git a/packfile.h b/packfile.h
index 3f59456e7e..ab5046938c 100644
--- a/packfile.h
+++ b/packfile.h
@@ -36,7 +36,8 @@ extern void (*report_garbage)(unsigned seen_bits, const char *path);
 
 #define prepare_packed_git(r) prepare_packed_git_##r()
 extern void prepare_packed_git_the_repository(void);
-extern void reprepare_packed_git(void);
+#define reprepare_packed_git(r) reprepare_packed_git_##r()
+extern void reprepare_packed_git_the_repository(void);
 extern void install_packed_git(struct repository *r, struct packed_git *pack);
 
 struct packed_git *get_packed_git(struct repository *r);
diff --git a/sha1_file.c b/sha1_file.c
index 0989bbd948..9c024cd957 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -1274,7 +1274,7 @@ int sha1_object_info_extended(const unsigned char *sha1, struct object_info *oi,
                         return 0;
 
                 /* Not a loose object; someone else may have just packed it. */
-                reprepare_packed_git();
+                reprepare_packed_git(the_repository);
                 if (find_pack_entry(real, &e))
                         break;