Merge branch 'maint'

* maint:
  fix up strtoul_ui error handling
  git-tar-tree: complete deprecation conversion message

diff --git a/Documentation/git-tar-tree.txt b/Documentation/git-tar-tree.txt
index 595940524e7d7f1112700899cf74e24e1c2e1e87..7bde73b1b85df03893fa15b99b17c5aff09ae574 100644 (file)
--- 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 b3d4acee6de30aa27717133d09a3bc313c7569f4..e5541df28423c4297187f5b9d42c5362fba5de29 100644 (file)
--- 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 cf03bcfe5aa4f95ec4b6384bc38d63b1e453f731..cefbcebdcaa0a085745c81b2ed1103e9575cb635 100644 (file)
--- 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++;