81b50f3ce4
This shrinks the top-level directory a bit, and makes it much more pleasant to use auto-completion on the thing. Instead of [torvalds@nehalem git]$ em buil<tab> Display all 180 possibilities? (y or n) [torvalds@nehalem git]$ em builtin-sh builtin-shortlog.c builtin-show-branch.c builtin-show-ref.c builtin-shortlog.o builtin-show-branch.o builtin-show-ref.o [torvalds@nehalem git]$ em builtin-shor<tab> builtin-shortlog.c builtin-shortlog.o [torvalds@nehalem git]$ em builtin-shortlog.c you get [torvalds@nehalem git]$ em buil<tab> [type] builtin/ builtin.h [torvalds@nehalem git]$ em builtin [auto-completes to] [torvalds@nehalem git]$ em builtin/sh<tab> [type] shortlog.c shortlog.o show-branch.c show-branch.o show-ref.c show-ref.o [torvalds@nehalem git]$ em builtin/sho [auto-completes to] [torvalds@nehalem git]$ em builtin/shor<tab> [type] shortlog.c shortlog.o [torvalds@nehalem git]$ em builtin/shortlog.c which doesn't seem all that different, but not having that annoying break in "Display all 180 possibilities?" is quite a relief. NOTE! If you do this in a clean tree (no object files etc), or using an editor that has auto-completion rules that ignores '*.o' files, you won't see that annoying 'Display all 180 possibilities?' message - it will just show the choices instead. I think bash has some cut-off around 100 choices or something. So the reason I see this is that I'm using an odd editory, and thus don't have the rules to cut down on auto-completion. But you can simulate that by using 'ls' instead, or something similar. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
135 lines
3.5 KiB
C
135 lines
3.5 KiB
C
/*
|
|
* GIT - The information manager from hell
|
|
*
|
|
* Copyright (C) Linus Torvalds, 2005
|
|
* Copyright (C) Junio C Hamano, 2005
|
|
*/
|
|
#include "cache.h"
|
|
#include "blob.h"
|
|
#include "quote.h"
|
|
#include "parse-options.h"
|
|
#include "exec_cmd.h"
|
|
|
|
static void hash_fd(int fd, const char *type, int write_object, const char *path)
|
|
{
|
|
struct stat st;
|
|
unsigned char sha1[20];
|
|
if (fstat(fd, &st) < 0 ||
|
|
index_fd(sha1, fd, &st, write_object, type_from_string(type), path))
|
|
die(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)
|
|
{
|
|
int fd;
|
|
fd = open(path, O_RDONLY);
|
|
if (fd < 0)
|
|
die_errno("Cannot open '%s'", path);
|
|
hash_fd(fd, type, write_object, vpath);
|
|
}
|
|
|
|
static void hash_stdin_paths(const char *type, int write_objects)
|
|
{
|
|
struct strbuf buf = STRBUF_INIT, nbuf = STRBUF_INIT;
|
|
|
|
while (strbuf_getline(&buf, stdin, '\n') != EOF) {
|
|
if (buf.buf[0] == '"') {
|
|
strbuf_reset(&nbuf);
|
|
if (unquote_c_style(&nbuf, buf.buf, NULL))
|
|
die("line is badly quoted");
|
|
strbuf_swap(&buf, &nbuf);
|
|
}
|
|
hash_object(buf.buf, type, write_objects, buf.buf);
|
|
}
|
|
strbuf_release(&buf);
|
|
strbuf_release(&nbuf);
|
|
}
|
|
|
|
static const char * const hash_object_usage[] = {
|
|
"git hash-object [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] <file>...",
|
|
"git hash-object --stdin-paths < <list-of-paths>",
|
|
NULL
|
|
};
|
|
|
|
static const char *type;
|
|
static int write_object;
|
|
static int hashstdin;
|
|
static int stdin_paths;
|
|
static int no_filters;
|
|
static const char *vpath;
|
|
|
|
static const struct option hash_object_options[] = {
|
|
OPT_STRING('t', NULL, &type, "type", "object type"),
|
|
OPT_BOOLEAN('w', NULL, &write_object, "write the object into the object database"),
|
|
OPT_BOOLEAN( 0 , "stdin", &hashstdin, "read the object from stdin"),
|
|
OPT_BOOLEAN( 0 , "stdin-paths", &stdin_paths, "read file names from stdin"),
|
|
OPT_BOOLEAN( 0 , "no-filters", &no_filters, "store file as is without filters"),
|
|
OPT_STRING( 0 , "path", &vpath, "file", "process file as it were from this path"),
|
|
OPT_END()
|
|
};
|
|
|
|
int cmd_hash_object(int argc, const char **argv, const char *prefix)
|
|
{
|
|
int i;
|
|
int prefix_length = -1;
|
|
const char *errstr = NULL;
|
|
|
|
type = blob_type;
|
|
|
|
argc = parse_options(argc, argv, NULL, hash_object_options,
|
|
hash_object_usage, 0);
|
|
|
|
if (write_object) {
|
|
prefix = setup_git_directory();
|
|
prefix_length = prefix ? strlen(prefix) : 0;
|
|
if (vpath && prefix)
|
|
vpath = prefix_filename(prefix, prefix_length, vpath);
|
|
}
|
|
|
|
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 (no_filters)
|
|
errstr = "Can't use --stdin-paths with --no-filters";
|
|
}
|
|
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, write_object, vpath);
|
|
|
|
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);
|
|
}
|
|
|
|
if (stdin_paths)
|
|
hash_stdin_paths(type, write_object);
|
|
|
|
return 0;
|
|
}
|