2005-07-08 23:51:55 +00:00
|
|
|
/*
|
|
|
|
* GIT - The information manager from hell
|
|
|
|
*
|
|
|
|
* Copyright (C) Linus Torvalds, 2005
|
2006-04-02 12:44:09 +00:00
|
|
|
* Copyright (C) Junio C Hamano, 2005
|
2005-07-08 23:51:55 +00:00
|
|
|
*/
|
Fix sparse warnings
Fix warnings from 'make check'.
- These files don't include 'builtin.h' causing sparse to complain that
cmd_* isn't declared:
builtin/clone.c:364, builtin/fetch-pack.c:797,
builtin/fmt-merge-msg.c:34, builtin/hash-object.c:78,
builtin/merge-index.c:69, builtin/merge-recursive.c:22
builtin/merge-tree.c:341, builtin/mktag.c:156, builtin/notes.c:426
builtin/notes.c:822, builtin/pack-redundant.c:596,
builtin/pack-refs.c:10, builtin/patch-id.c:60, builtin/patch-id.c:149,
builtin/remote.c:1512, builtin/remote-ext.c:240,
builtin/remote-fd.c:53, builtin/reset.c:236, builtin/send-pack.c:384,
builtin/unpack-file.c:25, builtin/var.c:75
- These files have symbols which should be marked static since they're
only file scope:
submodule.c:12, diff.c:631, replace_object.c:92, submodule.c:13,
submodule.c:14, trace.c:78, transport.c:195, transport-helper.c:79,
unpack-trees.c:19, url.c:3, url.c:18, url.c:104, url.c:117, url.c:123,
url.c:129, url.c:136, thread-utils.c:21, thread-utils.c:48
- These files redeclare symbols to be different types:
builtin/index-pack.c:210, parse-options.c:564, parse-options.c:571,
usage.c:49, usage.c:58, usage.c:63, usage.c:72
- These files use a literal integer 0 when they really should use a NULL
pointer:
daemon.c:663, fast-import.c:2942, imap-send.c:1072, notes-merge.c:362
While we're in the area, clean up some unused #includes in builtin files
(mostly exec_cmd.h).
Signed-off-by: Stephen Boyd <bebarino@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-03-22 07:51:05 +00:00
|
|
|
#include "builtin.h"
|
2006-04-02 12:44:09 +00:00
|
|
|
#include "blob.h"
|
2008-05-23 14:19:38 +00:00
|
|
|
#include "quote.h"
|
2008-08-03 14:36:20 +00:00
|
|
|
#include "parse-options.h"
|
2009-01-18 12:00:12 +00:00
|
|
|
#include "exec_cmd.h"
|
2005-07-08 23:51:55 +00:00
|
|
|
|
2014-09-11 20:14:51 +00:00
|
|
|
/*
|
|
|
|
* 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(unsigned char *sha1, int fd, const char *type, unsigned flags)
|
|
|
|
{
|
|
|
|
struct strbuf buf = STRBUF_INIT;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
if (strbuf_read(&buf, fd, 4096) < 0)
|
|
|
|
ret = -1;
|
|
|
|
else
|
2015-05-04 07:25:15 +00:00
|
|
|
ret = hash_sha1_file_literally(buf.buf, buf.len, type, sha1, flags);
|
2014-09-11 20:14:51 +00:00
|
|
|
strbuf_release(&buf);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void hash_fd(int fd, const char *type, const char *path, unsigned flags,
|
|
|
|
int literally)
|
2005-07-08 23:51:55 +00:00
|
|
|
{
|
|
|
|
struct stat st;
|
|
|
|
unsigned char sha1[20];
|
2011-05-08 08:47:33 +00:00
|
|
|
|
2008-08-03 04:39:16 +00:00
|
|
|
if (fstat(fd, &st) < 0 ||
|
2014-09-11 20:14:51 +00:00
|
|
|
(literally
|
|
|
|
? hash_literally(sha1, fd, type, flags)
|
|
|
|
: index_fd(sha1, fd, &st, type_from_string(type), path, flags)))
|
2014-09-11 19:44:05 +00:00
|
|
|
die((flags & HASH_WRITE_OBJECT)
|
2005-07-08 23:51:55 +00:00
|
|
|
? "Unable to add %s to database"
|
|
|
|
: "Unable to hash %s", path);
|
|
|
|
printf("%s\n", sha1_to_hex(sha1));
|
2008-05-23 14:19:38 +00:00
|
|
|
maybe_flush_or_die(stdout, "hash to stdout");
|
2005-07-08 23:51:55 +00:00
|
|
|
}
|
|
|
|
|
2014-09-11 19:44:05 +00:00
|
|
|
static void hash_object(const char *path, const char *type, const char *vpath,
|
2014-09-11 20:14:51 +00:00
|
|
|
unsigned flags, int literally)
|
2005-12-10 22:25:24 +00:00
|
|
|
{
|
2008-08-03 04:39:16 +00:00
|
|
|
int fd;
|
|
|
|
fd = open(path, O_RDONLY);
|
|
|
|
if (fd < 0)
|
2009-06-27 15:58:47 +00:00
|
|
|
die_errno("Cannot open '%s'", path);
|
2014-09-11 20:14:51 +00:00
|
|
|
hash_fd(fd, type, vpath, flags, literally);
|
2005-12-10 22:25:24 +00:00
|
|
|
}
|
|
|
|
|
2014-09-11 20:14:51 +00:00
|
|
|
static void hash_stdin_paths(const char *type, int no_filters, unsigned flags,
|
|
|
|
int literally)
|
2008-05-23 14:19:38 +00:00
|
|
|
{
|
2008-10-09 19:12:12 +00:00
|
|
|
struct strbuf buf = STRBUF_INIT, nbuf = STRBUF_INIT;
|
2008-05-23 14:19:38 +00:00
|
|
|
|
2016-01-13 23:31:17 +00:00
|
|
|
while (strbuf_getline_lf(&buf, stdin) != EOF) {
|
2008-05-23 14:19:38 +00:00
|
|
|
if (buf.buf[0] == '"') {
|
|
|
|
strbuf_reset(&nbuf);
|
|
|
|
if (unquote_c_style(&nbuf, buf.buf, NULL))
|
|
|
|
die("line is badly quoted");
|
|
|
|
strbuf_swap(&buf, &nbuf);
|
|
|
|
}
|
2014-09-11 20:14:51 +00:00
|
|
|
hash_object(buf.buf, type, no_filters ? NULL : buf.buf, flags,
|
|
|
|
literally);
|
2008-05-23 14:19:38 +00:00
|
|
|
}
|
|
|
|
strbuf_release(&buf);
|
|
|
|
strbuf_release(&nbuf);
|
|
|
|
}
|
|
|
|
|
2010-01-22 03:50:11 +00:00
|
|
|
int cmd_hash_object(int argc, const char **argv, const char *prefix)
|
2005-07-08 23:51:55 +00:00
|
|
|
{
|
2014-09-11 19:19:54 +00:00
|
|
|
static const char * const hash_object_usage[] = {
|
2015-01-13 07:44:47 +00:00
|
|
|
N_("git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] [--] <file>..."),
|
usage: do not insist that standard input must come from a file
The synopsys text and the usage string of subcommands that read list
of things from the standard input are often shown like this:
git gostak [--distim] < <list-of-doshes>
This is problematic in a number of ways:
* The way to use these commands is more often to feed them the
output from another command, not feed them from a file.
* Manual pages outside Git, commands that operate on the data read
from the standard input, e.g "sort", "grep", "sed", etc., are not
described with such a "< redirection-from-file" in their synopsys
text. Our doing so introduces inconsistency.
* We do not insist on where the output should go, by saying
git gostak [--distim] < <list-of-doshes> > <output>
* As it is our convention to enclose placeholders inside <braket>,
the redirection operator followed by a placeholder filename
becomes very hard to read, both in the documentation and in the
help text.
Let's clean them all up, after making sure that the documentation
clearly describes the modes that take information from the standard
input and what kind of things are expected on the input.
[jc: stole example for fmt-merge-msg from Jonathan]
Helped-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2015-10-16 18:27:42 +00:00
|
|
|
N_("git hash-object --stdin-paths"),
|
2014-09-11 19:19:54 +00:00
|
|
|
NULL
|
|
|
|
};
|
|
|
|
const char *type = blob_type;
|
|
|
|
int hashstdin = 0;
|
|
|
|
int stdin_paths = 0;
|
|
|
|
int no_filters = 0;
|
2014-09-11 20:14:51 +00:00
|
|
|
int literally = 0;
|
2014-09-11 19:44:05 +00:00
|
|
|
unsigned flags = HASH_FORMAT_CHECK;
|
2014-09-11 19:19:54 +00:00
|
|
|
const char *vpath = NULL;
|
|
|
|
const struct option hash_object_options[] = {
|
|
|
|
OPT_STRING('t', NULL, &type, N_("type"), N_("object type")),
|
2014-09-11 19:44:05 +00:00
|
|
|
OPT_BIT('w', NULL, &flags, N_("write the object into the object database"),
|
|
|
|
HASH_WRITE_OBJECT),
|
2014-09-11 19:19:54 +00:00
|
|
|
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")),
|
2014-09-11 20:14:51 +00:00
|
|
|
OPT_BOOL( 0, "literally", &literally, N_("just hash any random garbage to create corrupt objects for debugging Git")),
|
2014-09-11 19:19:54 +00:00
|
|
|
OPT_STRING( 0 , "path", &vpath, N_("file"), N_("process file as it were from this path")),
|
|
|
|
OPT_END()
|
|
|
|
};
|
2005-07-08 23:51:55 +00:00
|
|
|
int i;
|
2005-11-26 08:30:07 +00:00
|
|
|
int prefix_length = -1;
|
2008-08-03 14:36:20 +00:00
|
|
|
const char *errstr = NULL;
|
|
|
|
|
2009-05-23 18:53:12 +00:00
|
|
|
argc = parse_options(argc, argv, NULL, hash_object_options,
|
|
|
|
hash_object_usage, 0);
|
2008-08-03 14:36:20 +00:00
|
|
|
|
2014-09-11 19:44:05 +00:00
|
|
|
if (flags & HASH_WRITE_OBJECT) {
|
2008-08-03 14:36:20 +00:00
|
|
|
prefix = setup_git_directory();
|
|
|
|
prefix_length = prefix ? strlen(prefix) : 0;
|
2008-08-03 14:36:21 +00:00
|
|
|
if (vpath && prefix)
|
|
|
|
vpath = prefix_filename(prefix, prefix_length, vpath);
|
2005-07-08 23:51:55 +00:00
|
|
|
}
|
2008-05-23 14:19:38 +00:00
|
|
|
|
2009-02-28 19:56:49 +00:00
|
|
|
git_config(git_default_config, NULL);
|
|
|
|
|
2008-08-03 14:36:20 +00:00
|
|
|
if (stdin_paths) {
|
|
|
|
if (hashstdin)
|
|
|
|
errstr = "Can't use --stdin-paths with --stdin";
|
|
|
|
else if (argc)
|
|
|
|
errstr = "Can't specify files with --stdin-paths";
|
2008-08-03 14:36:21 +00:00
|
|
|
else if (vpath)
|
|
|
|
errstr = "Can't use --stdin-paths with --path";
|
2008-08-03 14:36:22 +00:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
if (hashstdin > 1)
|
|
|
|
errstr = "Multiple --stdin arguments are not supported";
|
|
|
|
if (vpath && no_filters)
|
|
|
|
errstr = "Can't use --path with --no-filters";
|
2008-08-03 14:36:20 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (errstr) {
|
2008-11-10 21:07:52 +00:00
|
|
|
error("%s", errstr);
|
2008-08-03 14:36:20 +00:00
|
|
|
usage_with_options(hash_object_usage, hash_object_options);
|
|
|
|
}
|
2008-05-23 14:19:38 +00:00
|
|
|
|
2008-02-21 10:06:47 +00:00
|
|
|
if (hashstdin)
|
2014-09-11 20:14:51 +00:00
|
|
|
hash_fd(0, type, vpath, flags, literally);
|
2008-08-03 14:36:20 +00:00
|
|
|
|
|
|
|
for (i = 0 ; i < argc; i++) {
|
|
|
|
const char *arg = argv[i];
|
|
|
|
|
|
|
|
if (0 <= prefix_length)
|
|
|
|
arg = prefix_filename(prefix, prefix_length, arg);
|
2014-09-11 19:44:05 +00:00
|
|
|
hash_object(arg, type, no_filters ? NULL : vpath ? vpath : arg,
|
2014-09-11 20:14:51 +00:00
|
|
|
flags, literally);
|
2008-08-03 14:36:20 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (stdin_paths)
|
2014-09-11 20:14:51 +00:00
|
|
|
hash_stdin_paths(type, no_filters, flags, literally);
|
2008-08-03 14:36:20 +00:00
|
|
|
|
2005-07-08 23:51:55 +00:00
|
|
|
return 0;
|
|
|
|
}
|