mirror of
https://github.com/git/git.git
synced 2024-11-09 02:33:11 +01:00
8a2f5e5b03
git hash-object used to process the --stdin command line argument
before reading subsequent arguments. This caused 'git hash-object
--stdin -w' to fail to actually write the object into the
database, while '-w --stdin' properly did. Now git hash-object
first reads all arguments, and then processes them.
This regresses one insane use case. git hash-object used to allow
multiple --stdin arguments on the command line:
$ git hash-object --stdin --stdin
foo
^D
bar
^D
Now git hash-object errors out if --stdin is given more than once.
Reported by Josh Triplett through
http://bugs.debian.org/464432
Signed-off-by: Gerrit Pape <pape@smarden.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
93 lines
2.1 KiB
C
93 lines
2.1 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"
|
|
|
|
static void hash_object(const char *path, enum object_type type, int write_object)
|
|
{
|
|
int fd;
|
|
struct stat st;
|
|
unsigned char sha1[20];
|
|
fd = open(path, O_RDONLY);
|
|
if (fd < 0 ||
|
|
fstat(fd, &st) < 0 ||
|
|
index_fd(sha1, fd, &st, write_object, type, path))
|
|
die(write_object
|
|
? "Unable to add %s to database"
|
|
: "Unable to hash %s", path);
|
|
printf("%s\n", sha1_to_hex(sha1));
|
|
}
|
|
|
|
static void hash_stdin(const char *type, int write_object)
|
|
{
|
|
unsigned char sha1[20];
|
|
if (index_pipe(sha1, 0, type, write_object))
|
|
die("Unable to add stdin to database");
|
|
printf("%s\n", sha1_to_hex(sha1));
|
|
}
|
|
|
|
static const char hash_object_usage[] =
|
|
"git-hash-object [-t <type>] [-w] [--stdin] <file>...";
|
|
|
|
int main(int argc, char **argv)
|
|
{
|
|
int i;
|
|
const char *type = blob_type;
|
|
int write_object = 0;
|
|
const char *prefix = NULL;
|
|
int prefix_length = -1;
|
|
int no_more_flags = 0;
|
|
int hashstdin = 0;
|
|
|
|
git_config(git_default_config);
|
|
|
|
for (i = 1 ; i < argc; i++) {
|
|
if (!no_more_flags && argv[i][0] == '-') {
|
|
if (!strcmp(argv[i], "-t")) {
|
|
if (argc <= ++i)
|
|
usage(hash_object_usage);
|
|
type = argv[i];
|
|
}
|
|
else if (!strcmp(argv[i], "-w")) {
|
|
if (prefix_length < 0) {
|
|
prefix = setup_git_directory();
|
|
prefix_length =
|
|
prefix ? strlen(prefix) : 0;
|
|
}
|
|
write_object = 1;
|
|
}
|
|
else if (!strcmp(argv[i], "--")) {
|
|
no_more_flags = 1;
|
|
}
|
|
else if (!strcmp(argv[i], "--help"))
|
|
usage(hash_object_usage);
|
|
else if (!strcmp(argv[i], "--stdin")) {
|
|
if (hashstdin)
|
|
die("Multiple --stdin arguments are not supported");
|
|
hashstdin = 1;
|
|
}
|
|
else
|
|
usage(hash_object_usage);
|
|
}
|
|
else {
|
|
const char *arg = argv[i];
|
|
|
|
if (hashstdin) {
|
|
hash_stdin(type, write_object);
|
|
hashstdin = 0;
|
|
}
|
|
if (0 <= prefix_length)
|
|
arg = prefix_filename(prefix, prefix_length,
|
|
arg);
|
|
hash_object(arg, type_from_string(type), write_object);
|
|
no_more_flags = 1;
|
|
}
|
|
}
|
|
if (hashstdin)
|
|
hash_stdin(type, write_object);
|
|
return 0;
|
|
}
|