mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
Merge branch 'maint'
* maint: fix up strtoul_ui error handling git-tar-tree: complete deprecation conversion message
This commit is contained in:
commit
2de00bf9e8
|
@ -13,7 +13,7 @@ SYNOPSIS
|
|||
DESCRIPTION
|
||||
-----------
|
||||
THIS COMMAND IS DEPRECATED. Use `git-archive` with `--format=tar`
|
||||
option instead.
|
||||
option instead (and move the <base> argument to `--prefix=base/`).
|
||||
|
||||
Creates a tar archive containing the tree structure for the named tree.
|
||||
When <base> is specified it is added as a leading path to the files in the
|
||||
|
|
|
@ -551,7 +551,7 @@ int cmd_update_index(int argc, const char **argv, const char *prefix)
|
|||
if (i+3 >= argc)
|
||||
die("git-update-index: --cacheinfo <mode> <sha1> <path>");
|
||||
|
||||
if ((strtoul_ui(argv[i+1], 8, &mode) != 1) ||
|
||||
if (strtoul_ui(argv[i+1], 8, &mode) ||
|
||||
get_sha1_hex(argv[i+2], sha1) ||
|
||||
add_cacheinfo(mode, sha1, argv[i+3], 0))
|
||||
die("git-update-index: --cacheinfo"
|
||||
|
|
|
@ -88,7 +88,7 @@ static int write_subdirectory(void *buffer, unsigned long size, const char *base
|
|||
unsigned int mode;
|
||||
char *slash, *origpath;
|
||||
|
||||
if (!path || strtoul_ui(buffer, 8, &mode) != 1)
|
||||
if (!path || strtoul_ui(buffer, 8, &mode))
|
||||
die("bad tree conversion");
|
||||
mode = convert_mode(mode);
|
||||
path++;
|
||||
|
|
Loading…
Reference in a new issue