diff options
Diffstat (limited to 'unpack-file.c')
| -rw-r--r-- | unpack-file.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/unpack-file.c b/unpack-file.c index bcdc8bbb3b..e9d8934691 100644 --- a/unpack-file.c +++ b/unpack-file.c @@ -1,5 +1,6 @@ #include "cache.h" #include "blob.h" +#include "exec_cmd.h" static char *create_temp_file(unsigned char *sha1) { @@ -16,7 +17,7 @@ static char *create_temp_file(unsigned char *sha1) strcpy(path, ".merge_file_XXXXXX"); fd = xmkstemp(path); if (write_in_full(fd, buf, size) != size) - die("unable to write temp-file"); + die_errno("unable to write temp-file"); close(fd); return path; } @@ -25,8 +26,10 @@ int main(int argc, char **argv) { unsigned char sha1[20]; - if (argc != 2) - usage("git-unpack-file <sha1>"); + git_extract_argv0_path(argv[0]); + + if (argc != 2 || !strcmp(argv[1], "-h")) + usage("git unpack-file <sha1>"); if (get_sha1(argv[1], sha1)) die("Not a valid object name %s", argv[1]); |