Merge branch 'ps/contains-id-error-message'

diff --git a/builtin/update-index.c b/builtin/update-index.c
index 34adf55a719915c6e69f8983a37851ca99e9b60b..10d070a76fb1b0b94c058f60934bb05db37a4164 100644 (file)
--- a/builtin/update-index.c
+++ b/builtin/update-index.c
@@ -592,7 +592,7 @@ static struct cache_entry *read_one_ent(const char *which,
        int size;
        struct cache_entry *ce;
 
-       if (get_tree_entry(ent->hash, path, oid.hash, &mode)) {
+       if (get_tree_entry(ent, path, &oid, &mode)) {
                if (which)
                        error("%s: not in %s branch.", path, which);
                return NULL;