Browse Source

pack: move has_sha1_pack()

Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Jonathan Tan 8 years ago committed by Junio C Hamano
parent
commit
150e3001d0
  1. 1
      builtin/prune-packed.c
  2. 2
      cache.h
  3. 1
      diff.c
  4. 6
      packfile.c
  5. 2
      packfile.h
  6. 1
      revision.c
  7. 6
      sha1_file.c

1
builtin/prune-packed.c

@ -2,6 +2,7 @@
#include "cache.h" #include "cache.h"
#include "progress.h" #include "progress.h"
#include "parse-options.h" #include "parse-options.h"
#include "packfile.h"


static const char * const prune_packed_usage[] = { static const char * const prune_packed_usage[] = {
N_("git prune-packed [-n | --dry-run] [-q | --quiet]"), N_("git prune-packed [-n | --dry-run] [-q | --quiet]"),

2
cache.h

@ -1191,8 +1191,6 @@ extern int check_sha1_signature(const unsigned char *sha1, void *buf, unsigned l


extern int finalize_object_file(const char *tmpfile, const char *filename); extern int finalize_object_file(const char *tmpfile, const char *filename);


extern int has_sha1_pack(const unsigned char *sha1);

/* /*
* Open the loose object at path, check its sha1, and return the contents, * Open the loose object at path, check its sha1, and return the contents,
* type, and size. If the object is a blob, then "contents" may return NULL, * type, and size. If the object is a blob, then "contents" may return NULL,

1
diff.c

@ -20,6 +20,7 @@
#include "string-list.h" #include "string-list.h"
#include "argv-array.h" #include "argv-array.h"
#include "graph.h" #include "graph.h"
#include "packfile.h"


#ifdef NO_FAST_WORKING_DIRECTORY #ifdef NO_FAST_WORKING_DIRECTORY
#define FAST_WORKING_DIRECTORY 0 #define FAST_WORKING_DIRECTORY 0

6
packfile.c

@ -1840,3 +1840,9 @@ int find_pack_entry(const unsigned char *sha1, struct pack_entry *e)
} }
return 0; return 0;
} }

int has_sha1_pack(const unsigned char *sha1)
{
struct pack_entry e;
return find_pack_entry(sha1, &e);
}

2
packfile.h

@ -120,4 +120,6 @@ extern const struct packed_git *has_packed_and_bad(const unsigned char *sha1);


extern int find_pack_entry(const unsigned char *sha1, struct pack_entry *e); extern int find_pack_entry(const unsigned char *sha1, struct pack_entry *e);


extern int has_sha1_pack(const unsigned char *sha1);

#endif #endif

1
revision.c

@ -19,6 +19,7 @@
#include "dir.h" #include "dir.h"
#include "cache-tree.h" #include "cache-tree.h"
#include "bisect.h" #include "bisect.h"
#include "packfile.h"


volatile show_early_output_fn_t show_early_output; volatile show_early_output_fn_t show_early_output;



6
sha1_file.c

@ -1631,12 +1631,6 @@ int has_pack_index(const unsigned char *sha1)
return 1; return 1;
} }


int has_sha1_pack(const unsigned char *sha1)
{
struct pack_entry e;
return find_pack_entry(sha1, &e);
}

int has_sha1_file_with_flags(const unsigned char *sha1, int flags) int has_sha1_file_with_flags(const unsigned char *sha1, int flags)
{ {
if (!startup_info->have_repository) if (!startup_info->have_repository)

Loading…
Cancel
Save