The functions `hash_object_file()`, `write_object_file()` and `index_fd()` reuse the same set of flags to alter their behaviour. This not only adds confusion, but given that every function only supports a subset of the flags it becomes very hard to see which flags can be passed to what function. Last but not least, this entangles the implementation of all three function families. Split up concerns by creating separate flags for each of the function families. Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>
192 lines
5.1 KiB
C
192 lines
5.1 KiB
C
/*
|
|
* GIT - The information manager from hell
|
|
*
|
|
* Copyright (C) Linus Torvalds, 2005
|
|
* Copyright (C) Junio C Hamano, 2005
|
|
*/
|
|
#define USE_THE_REPOSITORY_VARIABLE
|
|
#include "builtin.h"
|
|
#include "abspath.h"
|
|
#include "config.h"
|
|
#include "gettext.h"
|
|
#include "hex.h"
|
|
#include "object-file.h"
|
|
#include "object-store-ll.h"
|
|
#include "blob.h"
|
|
#include "quote.h"
|
|
#include "parse-options.h"
|
|
#include "setup.h"
|
|
#include "strbuf.h"
|
|
#include "write-or-die.h"
|
|
|
|
enum {
|
|
HASH_OBJECT_CHECK = (1 << 0),
|
|
HASH_OBJECT_WRITE = (1 << 1),
|
|
};
|
|
|
|
/*
|
|
* This is to create corrupt objects for debugging and as such it
|
|
* needs to bypass the data conversion performed by, and the type
|
|
* limitation imposed by, index_fd() and its callees.
|
|
*/
|
|
static int hash_literally(struct object_id *oid, int fd, const char *type, unsigned flags)
|
|
{
|
|
struct strbuf buf = STRBUF_INIT;
|
|
int ret;
|
|
|
|
if (strbuf_read(&buf, fd, 4096) < 0)
|
|
ret = -1;
|
|
else
|
|
ret = write_object_file_literally(buf.buf, buf.len, type, oid,
|
|
(flags & HASH_OBJECT_WRITE) ? WRITE_OBJECT_FILE_PERSIST : 0);
|
|
close(fd);
|
|
strbuf_release(&buf);
|
|
return ret;
|
|
}
|
|
|
|
static void hash_fd(int fd, const char *type, const char *path, unsigned flags,
|
|
int literally)
|
|
{
|
|
unsigned int index_flags = 0;
|
|
struct stat st;
|
|
struct object_id oid;
|
|
|
|
if (flags & HASH_OBJECT_WRITE)
|
|
index_flags |= INDEX_WRITE_OBJECT;
|
|
if (flags & HASH_OBJECT_CHECK)
|
|
index_flags |= INDEX_FORMAT_CHECK;
|
|
|
|
if (fstat(fd, &st) < 0 ||
|
|
(literally
|
|
? hash_literally(&oid, fd, type, flags)
|
|
: index_fd(the_repository->index, &oid, fd, &st,
|
|
type_from_string(type), path, index_flags)))
|
|
die((flags & HASH_OBJECT_WRITE)
|
|
? "Unable to add %s to database"
|
|
: "Unable to hash %s", path);
|
|
printf("%s\n", oid_to_hex(&oid));
|
|
maybe_flush_or_die(stdout, "hash to stdout");
|
|
}
|
|
|
|
static void hash_object(const char *path, const char *type, const char *vpath,
|
|
unsigned flags, int literally)
|
|
{
|
|
int fd;
|
|
fd = xopen(path, O_RDONLY);
|
|
hash_fd(fd, type, vpath, flags, literally);
|
|
}
|
|
|
|
static void hash_stdin_paths(const char *type, int no_filters, unsigned flags,
|
|
int literally)
|
|
{
|
|
struct strbuf buf = STRBUF_INIT;
|
|
struct strbuf unquoted = STRBUF_INIT;
|
|
|
|
while (strbuf_getline(&buf, stdin) != EOF) {
|
|
if (buf.buf[0] == '"') {
|
|
strbuf_reset(&unquoted);
|
|
if (unquote_c_style(&unquoted, buf.buf, NULL))
|
|
die("line is badly quoted");
|
|
strbuf_swap(&buf, &unquoted);
|
|
}
|
|
hash_object(buf.buf, type, no_filters ? NULL : buf.buf, flags,
|
|
literally);
|
|
}
|
|
strbuf_release(&buf);
|
|
strbuf_release(&unquoted);
|
|
}
|
|
|
|
int cmd_hash_object(int argc,
|
|
const char **argv,
|
|
const char *prefix,
|
|
struct repository *repo UNUSED)
|
|
{
|
|
static const char * const hash_object_usage[] = {
|
|
N_("git hash-object [-t <type>] [-w] [--path=<file> | --no-filters]\n"
|
|
" [--stdin [--literally]] [--] <file>..."),
|
|
N_("git hash-object [-t <type>] [-w] --stdin-paths [--no-filters]"),
|
|
NULL
|
|
};
|
|
const char *type = blob_type;
|
|
int hashstdin = 0;
|
|
int stdin_paths = 0;
|
|
int no_filters = 0;
|
|
int literally = 0;
|
|
int nongit = 0;
|
|
unsigned flags = HASH_OBJECT_CHECK;
|
|
const char *vpath = NULL;
|
|
char *vpath_free = NULL;
|
|
const struct option hash_object_options[] = {
|
|
OPT_STRING('t', NULL, &type, N_("type"), N_("object type")),
|
|
OPT_BIT('w', NULL, &flags, N_("write the object into the object database"),
|
|
HASH_OBJECT_WRITE),
|
|
OPT_COUNTUP( 0 , "stdin", &hashstdin, N_("read the object from stdin")),
|
|
OPT_BOOL( 0 , "stdin-paths", &stdin_paths, N_("read file names from stdin")),
|
|
OPT_BOOL( 0 , "no-filters", &no_filters, N_("store file as is without filters")),
|
|
OPT_BOOL( 0, "literally", &literally, N_("just hash any random garbage to create corrupt objects for debugging Git")),
|
|
OPT_STRING( 0 , "path", &vpath, N_("file"), N_("process file as it were from this path")),
|
|
OPT_END()
|
|
};
|
|
int i;
|
|
const char *errstr = NULL;
|
|
|
|
argc = parse_options(argc, argv, prefix, hash_object_options,
|
|
hash_object_usage, 0);
|
|
|
|
if (flags & HASH_OBJECT_WRITE)
|
|
prefix = setup_git_directory();
|
|
else
|
|
prefix = setup_git_directory_gently(&nongit);
|
|
|
|
if (nongit && !the_hash_algo)
|
|
repo_set_hash_algo(the_repository, GIT_HASH_SHA1);
|
|
|
|
if (vpath && prefix) {
|
|
vpath_free = prefix_filename(prefix, vpath);
|
|
vpath = vpath_free;
|
|
}
|
|
|
|
git_config(git_default_config, NULL);
|
|
|
|
if (stdin_paths) {
|
|
if (hashstdin)
|
|
errstr = "Can't use --stdin-paths with --stdin";
|
|
else if (argc)
|
|
errstr = "Can't specify files with --stdin-paths";
|
|
else if (vpath)
|
|
errstr = "Can't use --stdin-paths with --path";
|
|
}
|
|
else {
|
|
if (hashstdin > 1)
|
|
errstr = "Multiple --stdin arguments are not supported";
|
|
if (vpath && no_filters)
|
|
errstr = "Can't use --path with --no-filters";
|
|
}
|
|
|
|
if (errstr) {
|
|
error("%s", errstr);
|
|
usage_with_options(hash_object_usage, hash_object_options);
|
|
}
|
|
|
|
if (hashstdin)
|
|
hash_fd(0, type, vpath, flags, literally);
|
|
|
|
for (i = 0 ; i < argc; i++) {
|
|
const char *arg = argv[i];
|
|
char *to_free = NULL;
|
|
|
|
if (prefix)
|
|
arg = to_free = prefix_filename(prefix, arg);
|
|
hash_object(arg, type, no_filters ? NULL : vpath ? vpath : arg,
|
|
flags, literally);
|
|
free(to_free);
|
|
}
|
|
|
|
if (stdin_paths)
|
|
hash_stdin_paths(type, no_filters, flags, literally);
|
|
|
|
free(vpath_free);
|
|
|
|
return 0;
|
|
}
|