diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-04-19 02:33:38 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-04-19 02:33:38 (GMT) |
| commit | 2de00bf9e8815970c61cefaef35efeacd8a7d6de (patch) | |
| tree | 3a9f5d3948d4716c12efaadfeef4c5de10a9dec6 | |
| parent | 6fb8e8f401a065bdffe379764871551e37a041a0 (diff) | |
| parent | 6e6db39afc305e1205a4d2dcf34680bfa80bfc24 (diff) | |
| download | git-2de00bf9e8815970c61cefaef35efeacd8a7d6de.zip git-2de00bf9e8815970c61cefaef35efeacd8a7d6de.tar.gz git-2de00bf9e8815970c61cefaef35efeacd8a7d6de.tar.bz2 | |
Merge branch 'maint'
* maint:
fix up strtoul_ui error handling
git-tar-tree: complete deprecation conversion message
| -rw-r--r-- | Documentation/git-tar-tree.txt | 2 | ||||
| -rw-r--r-- | builtin-update-index.c | 2 | ||||
| -rw-r--r-- | convert-objects.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/git-tar-tree.txt b/Documentation/git-tar-tree.txt index 5959405..7bde73b 100644 --- a/Documentation/git-tar-tree.txt +++ b/Documentation/git-tar-tree.txt @@ -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 diff --git a/builtin-update-index.c b/builtin-update-index.c index b3d4ace..e5541df 100644 --- a/builtin-update-index.c +++ b/builtin-update-index.c @@ -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" diff --git a/convert-objects.c b/convert-objects.c index cf03bcf..cefbceb 100644 --- a/convert-objects.c +++ b/convert-objects.c @@ -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++; |