Merge branch 'nd/the-index-final'

diff --git a/builtin/cat-file.c b/builtin/cat-file.c
index a5ca47c697e6ef363a40224916fd451554120fb8..8487cd7dba0681087a5700039c234084f071333c 100644 (file)
--- a/builtin/cat-file.c
+++ b/builtin/cat-file.c
@@ -382,7 +382,7 @@ static void batch_one_object(const char *obj_name,
 {
        struct object_context ctx;
        int flags = opt->follow_symlinks ? GET_OID_FOLLOW_SYMLINKS : 0;
-       enum follow_symlinks_result result;
+       enum get_oid_result result;
 
        result = get_oid_with_context(the_repository, obj_name,
                                      flags, &data->oid, &ctx);
@@ -391,6 +391,9 @@ static void batch_one_object(const char *obj_name,
                case MISSING_OBJECT:
                        printf("%s missing\n", obj_name);
                        break;
+               case SHORT_NAME_AMBIGUOUS:
+                       printf("%s ambiguous\n", obj_name);
+                       break;
                case DANGLING_SYMLINK:
                        printf("dangling %"PRIuMAX"\n%s\n",
                               (uintmax_t)strlen(obj_name), obj_name);