t4013: prepare for upcoming "diff --raw --abbrev" output format change

diff --git a/dir.c b/dir.c
index a4198ba7fd7f334b947dc7ba7d14b588df1f32e2..fc2bdc79fc8ff599c8fba922dd7407cacae0c730 100644 (file)
--- a/dir.c
+++ b/dir.c
@@ -1391,8 +1391,8 @@ static enum path_treatment treat_directory(struct dir_struct *dir,
                        break;
                if (!(dir->flags & DIR_NO_GITLINKS)) {
                        struct object_id oid;
-                       if (resolve_gitlink_ref(dirname, "HEAD", oid.hash) == 0)
-                               return path_untracked;
+                       if (resolve_gitlink_ref(dirname, "HEAD", &oid) == 0)
+                               return exclude ? path_excluded : path_untracked;
                }
                return path_recurse;
        }
@@ -2282,7 +2282,7 @@ static int remove_dir_recurse(struct strbuf *path, int flag, int *kept_up)
        struct object_id submodule_head;
 
        if ((flag & REMOVE_DIR_KEEP_NESTED_GIT) &&
-           !resolve_gitlink_ref(path->buf, "HEAD", submodule_head.hash)) {
+           !resolve_gitlink_ref(path->buf, "HEAD", &submodule_head)) {
                /* Do not descend and nuke a nested git work tree. */
                if (kept_up)
                        *kept_up = 1;