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"
|
2017-06-14 18:07:36 +00:00
|
|
|
#include "config.h"
|
2023-03-21 06:25:54 +00:00
|
|
|
#include "gettext.h"
|
2023-02-24 00:09:27 +00:00
|
|
|
#include "hex.h"
|
2018-05-15 23:42:15 +00:00
|
|
|
#include "object-store.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"
|
2018-04-10 21:26:18 +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.
|
|
|
|
*/
|
2017-08-20 20:09:26 +00:00
|
|
|
static int hash_literally(struct object_id *oid, int fd, const char *type, unsigned flags)
|
2014-09-11 20:14:51 +00:00
|
|
|
{
|
|
|
|
struct strbuf buf = STRBUF_INIT;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
if (strbuf_read(&buf, fd, 4096) < 0)
|
|
|
|
ret = -1;
|
|
|
|
else
|
2022-02-04 23:48:31 +00:00
|
|
|
ret = write_object_file_literally(buf.buf, buf.len, type, oid,
|
2018-01-28 00:13:22 +00:00
|
|
|
flags);
|
2023-01-19 01:57:56 +00:00
|
|
|
close(fd);
|
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;
|
2017-08-20 20:09:26 +00:00
|
|
|
struct object_id oid;
|
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
|
2017-08-20 20:09:26 +00:00
|
|
|
? hash_literally(&oid, fd, type, flags)
|
2019-01-24 08:29:12 +00:00
|
|
|
: index_fd(the_repository->index, &oid, 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);
|
2017-08-20 20:09:26 +00:00
|
|
|
printf("%s\n", oid_to_hex(&oid));
|
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;
|
2021-08-25 20:16:46 +00:00
|
|
|
fd = xopen(path, O_RDONLY);
|
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
|
|
|
{
|
2016-01-31 11:25:26 +00:00
|
|
|
struct strbuf buf = STRBUF_INIT;
|
|
|
|
struct strbuf unquoted = STRBUF_INIT;
|
2008-05-23 14:19:38 +00:00
|
|
|
|
2015-10-28 20:56:23 +00:00
|
|
|
while (strbuf_getline(&buf, stdin) != EOF) {
|
2008-05-23 14:19:38 +00:00
|
|
|
if (buf.buf[0] == '"') {
|
2016-01-31 11:25:26 +00:00
|
|
|
strbuf_reset(&unquoted);
|
|
|
|
if (unquote_c_style(&unquoted, buf.buf, NULL))
|
2008-05-23 14:19:38 +00:00
|
|
|
die("line is badly quoted");
|
2016-01-31 11:25:26 +00:00
|
|
|
strbuf_swap(&buf, &unquoted);
|
2008-05-23 14:19:38 +00:00
|
|
|
}
|
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);
|
2016-01-31 11:25:26 +00:00
|
|
|
strbuf_release(&unquoted);
|
2008-05-23 14:19:38 +00:00
|
|
|
}
|
|
|
|
|
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[] = {
|
2022-10-13 15:39:02 +00:00
|
|
|
N_("git hash-object [-t <type>] [-w] [--path=<file> | --no-filters]\n"
|
2022-10-13 15:39:18 +00:00
|
|
|
" [--stdin [--literally]] [--] <file>..."),
|
|
|
|
N_("git hash-object [-t <type>] [-w] --stdin-paths [--no-filters]"),
|
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;
|
hash-object: always try to set up the git repository
When "hash-object" is run without "-w", we don't need to be
in a git repository at all; we can just hash the object and
write its sha1 to stdout. However, if we _are_ in a git
repository, we would want to know that so we can follow the
normal rules for respecting config, .gitattributes, etc.
This happens to work at the top-level of a git repository
because we blindly read ".git/config", but as the included
test shows, it does not work when you are in a subdirectory.
The solution is to just do a "gentle" setup in this case. We
already take care to use prefix_filename() on any filename
arguments we get (to handle the "-w" case), so we don't need
to do anything extra to handle the side effects of repo
setup.
An alternative would be to specify RUN_SETUP_GENTLY for this
command in git.c, and then die if "-w" is set but we are not
in a repository. However, the error messages generated at
the time of setup_git_directory() are more detailed, so it's
better to find out which mode we are in, and then call the
appropriate function.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-09-13 03:23:17 +00:00
|
|
|
int nongit = 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;
|
2022-02-05 00:04:29 +00:00
|
|
|
char *vpath_free = NULL;
|
2014-09-11 19:19:54 +00:00
|
|
|
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;
|
2008-08-03 14:36:20 +00:00
|
|
|
const char *errstr = NULL;
|
|
|
|
|
2019-05-09 21:28:51 +00:00
|
|
|
argc = parse_options(argc, argv, prefix, hash_object_options,
|
2009-05-23 18:53:12 +00:00
|
|
|
hash_object_usage, 0);
|
2008-08-03 14:36:20 +00:00
|
|
|
|
hash-object: always try to set up the git repository
When "hash-object" is run without "-w", we don't need to be
in a git repository at all; we can just hash the object and
write its sha1 to stdout. However, if we _are_ in a git
repository, we would want to know that so we can follow the
normal rules for respecting config, .gitattributes, etc.
This happens to work at the top-level of a git repository
because we blindly read ".git/config", but as the included
test shows, it does not work when you are in a subdirectory.
The solution is to just do a "gentle" setup in this case. We
already take care to use prefix_filename() on any filename
arguments we get (to handle the "-w" case), so we don't need
to do anything extra to handle the side effects of repo
setup.
An alternative would be to specify RUN_SETUP_GENTLY for this
command in git.c, and then die if "-w" is set but we are not
in a repository. However, the error messages generated at
the time of setup_git_directory() are more detailed, so it's
better to find out which mode we are in, and then call the
appropriate function.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-09-13 03:23:17 +00:00
|
|
|
if (flags & HASH_WRITE_OBJECT)
|
2008-08-03 14:36:20 +00:00
|
|
|
prefix = setup_git_directory();
|
hash-object: always try to set up the git repository
When "hash-object" is run without "-w", we don't need to be
in a git repository at all; we can just hash the object and
write its sha1 to stdout. However, if we _are_ in a git
repository, we would want to know that so we can follow the
normal rules for respecting config, .gitattributes, etc.
This happens to work at the top-level of a git repository
because we blindly read ".git/config", but as the included
test shows, it does not work when you are in a subdirectory.
The solution is to just do a "gentle" setup in this case. We
already take care to use prefix_filename() on any filename
arguments we get (to handle the "-w" case), so we don't need
to do anything extra to handle the side effects of repo
setup.
An alternative would be to specify RUN_SETUP_GENTLY for this
command in git.c, and then die if "-w" is set but we are not
in a repository. However, the error messages generated at
the time of setup_git_directory() are more detailed, so it's
better to find out which mode we are in, and then call the
appropriate function.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-09-13 03:23:17 +00:00
|
|
|
else
|
|
|
|
prefix = setup_git_directory_gently(&nongit);
|
|
|
|
|
2022-02-05 00:04:29 +00:00
|
|
|
if (vpath && prefix) {
|
|
|
|
vpath_free = prefix_filename(prefix, vpath);
|
|
|
|
vpath = vpath_free;
|
|
|
|
}
|
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];
|
2017-03-21 01:20:42 +00:00
|
|
|
char *to_free = NULL;
|
2008-08-03 14:36:20 +00:00
|
|
|
|
2017-03-21 01:22:28 +00:00
|
|
|
if (prefix)
|
2017-03-21 01:28:49 +00:00
|
|
|
arg = to_free = prefix_filename(prefix, 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);
|
2017-03-21 01:20:42 +00:00
|
|
|
free(to_free);
|
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
|
|
|
|
2022-02-05 00:04:29 +00:00
|
|
|
free(vpath_free);
|
|
|
|
|
2005-07-08 23:51:55 +00:00
|
|
|
return 0;
|
|
|
|
}
|