mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
hash-object: pass 'write_object' as a flag
Instead of forcing callers of lower level functions write (write_object ? HASH_WRITE_OBJECT : 0), prepare the flag to be passed down in the callchain from the command line parser. Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
b64a984606
commit
17b787f603
|
@ -10,33 +10,31 @@
|
|||
#include "parse-options.h"
|
||||
#include "exec_cmd.h"
|
||||
|
||||
static void hash_fd(int fd, const char *type, int write_object, const char *path)
|
||||
static void hash_fd(int fd, const char *type, const char *path, unsigned flags)
|
||||
{
|
||||
struct stat st;
|
||||
unsigned char sha1[20];
|
||||
unsigned flags = (HASH_FORMAT_CHECK |
|
||||
(write_object ? HASH_WRITE_OBJECT : 0));
|
||||
|
||||
if (fstat(fd, &st) < 0 ||
|
||||
index_fd(sha1, fd, &st, type_from_string(type), path, flags))
|
||||
die(write_object
|
||||
die((flags & HASH_WRITE_OBJECT)
|
||||
? "Unable to add %s to database"
|
||||
: "Unable to hash %s", path);
|
||||
printf("%s\n", sha1_to_hex(sha1));
|
||||
maybe_flush_or_die(stdout, "hash to stdout");
|
||||
}
|
||||
|
||||
static void hash_object(const char *path, const char *type, int write_object,
|
||||
const char *vpath)
|
||||
static void hash_object(const char *path, const char *type, const char *vpath,
|
||||
unsigned flags)
|
||||
{
|
||||
int fd;
|
||||
fd = open(path, O_RDONLY);
|
||||
if (fd < 0)
|
||||
die_errno("Cannot open '%s'", path);
|
||||
hash_fd(fd, type, write_object, vpath);
|
||||
hash_fd(fd, type, vpath, flags);
|
||||
}
|
||||
|
||||
static void hash_stdin_paths(const char *type, int write_objects, int no_filters)
|
||||
static void hash_stdin_paths(const char *type, int no_filters, unsigned flags)
|
||||
{
|
||||
struct strbuf buf = STRBUF_INIT, nbuf = STRBUF_INIT;
|
||||
|
||||
|
@ -47,8 +45,7 @@ static void hash_stdin_paths(const char *type, int write_objects, int no_filters
|
|||
die("line is badly quoted");
|
||||
strbuf_swap(&buf, &nbuf);
|
||||
}
|
||||
hash_object(buf.buf, type, write_objects,
|
||||
no_filters ? NULL : buf.buf);
|
||||
hash_object(buf.buf, type, no_filters ? NULL : buf.buf, flags);
|
||||
}
|
||||
strbuf_release(&buf);
|
||||
strbuf_release(&nbuf);
|
||||
|
@ -64,12 +61,13 @@ int cmd_hash_object(int argc, const char **argv, const char *prefix)
|
|||
const char *type = blob_type;
|
||||
int hashstdin = 0;
|
||||
int stdin_paths = 0;
|
||||
int write_object = 0;
|
||||
int no_filters = 0;
|
||||
unsigned flags = HASH_FORMAT_CHECK;
|
||||
const char *vpath = NULL;
|
||||
const struct option hash_object_options[] = {
|
||||
OPT_STRING('t', NULL, &type, N_("type"), N_("object type")),
|
||||
OPT_BOOL('w', NULL, &write_object, N_("write the object into the object database")),
|
||||
OPT_BIT('w', NULL, &flags, N_("write the object into the object database"),
|
||||
HASH_WRITE_OBJECT),
|
||||
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")),
|
||||
|
@ -83,7 +81,7 @@ int cmd_hash_object(int argc, const char **argv, const char *prefix)
|
|||
argc = parse_options(argc, argv, NULL, hash_object_options,
|
||||
hash_object_usage, 0);
|
||||
|
||||
if (write_object) {
|
||||
if (flags & HASH_WRITE_OBJECT) {
|
||||
prefix = setup_git_directory();
|
||||
prefix_length = prefix ? strlen(prefix) : 0;
|
||||
if (vpath && prefix)
|
||||
|
@ -113,19 +111,19 @@ int cmd_hash_object(int argc, const char **argv, const char *prefix)
|
|||
}
|
||||
|
||||
if (hashstdin)
|
||||
hash_fd(0, type, write_object, vpath);
|
||||
hash_fd(0, type, vpath, flags);
|
||||
|
||||
for (i = 0 ; i < argc; i++) {
|
||||
const char *arg = argv[i];
|
||||
|
||||
if (0 <= prefix_length)
|
||||
arg = prefix_filename(prefix, prefix_length, arg);
|
||||
hash_object(arg, type, write_object,
|
||||
no_filters ? NULL : vpath ? vpath : arg);
|
||||
hash_object(arg, type, no_filters ? NULL : vpath ? vpath : arg,
|
||||
flags);
|
||||
}
|
||||
|
||||
if (stdin_paths)
|
||||
hash_stdin_paths(type, write_object, no_filters);
|
||||
hash_stdin_paths(type, no_filters, flags);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue