mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

Browse Source 
* maint:
  fix up strtoul_ui error handling
  git-tar-tree: complete deprecation conversion message
This commit is contained in:
Junio C Hamano
2007-04-18 19:33:38 -07:00
parent 6fb8e8f401 6e6db39afc
commit 2de00bf9e8
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/git-tar-tree.txt
View File

@ -13,7 +13,7 @@ SYNOPSIS
DESCRIPTION DESCRIPTION
----------- -----------
THIS COMMAND IS DEPRECATED. Use `git-archive` with `--format=tar` 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. 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 When <base> is specified it is added as a leading path to the files in the

2
builtin-update-index.c
View File

@ -551,7 +551,7 @@ int cmd_update_index(int argc, const char **argv, const char *prefix)
if (i+3 >= argc) if (i+3 >= argc)
die("git-update-index: --cacheinfo <mode> <sha1> <path>"); 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) || get_sha1_hex(argv[i+2], sha1) ||
add_cacheinfo(mode, sha1, argv[i+3], 0)) add_cacheinfo(mode, sha1, argv[i+3], 0))
die("git-update-index: --cacheinfo" die("git-update-index: --cacheinfo"

2
convert-objects.c
View File

@ -88,7 +88,7 @@ static int write_subdirectory(void *buffer, unsigned long size, const char *base
unsigned int mode; unsigned int mode;
char *slash, *origpath; char *slash, *origpath;
if (!path || strtoul_ui(buffer, 8, &mode) != 1) if (!path || strtoul_ui(buffer, 8, &mode))
die("bad tree conversion"); die("bad tree conversion");
mode = convert_mode(mode); mode = convert_mode(mode);
path++; path++;