diff options
| author | Michael Haggerty <mhagger@alum.mit.edu> | 2017-10-28 09:27:15 +0200 |
|---|---|---|
| committer | Michael Haggerty <mhagger@alum.mit.edu> | 2017-10-28 09:27:15 +0200 |
| commit | ff08e56cde739152a59a86f5aa996954a2ec0614 (patch) | |
| tree | 9c7bc94151c5a082377ecb438e66aea140924edb /dir.c | |
| parent | 2f899857a9f425cb59f8a15c2ea7a52100c51a23 (diff) | |
| parent | 4f01e5080c4a7eee69da47c958888358e6127584 (diff) | |
| download | git-ff08e56cde739152a59a86f5aa996954a2ec0614.tar.gz git-ff08e56cde739152a59a86f5aa996954a2ec0614.tar.xz | |
Merge branch 'bc/object-id' into base
Diffstat (limited to 'dir.c')
| -rw-r--r-- | dir.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -1390,8 +1390,8 @@ static enum path_treatment treat_directory(struct dir_struct *dir, if (dir->flags & DIR_SHOW_OTHER_DIRECTORIES) break; if (!(dir->flags & DIR_NO_GITLINKS)) { - unsigned char sha1[20]; - if (resolve_gitlink_ref(dirname, "HEAD", sha1) == 0) + struct object_id oid; + if (resolve_gitlink_ref(dirname, "HEAD", &oid) == 0) return path_untracked; } return path_recurse; @@ -2279,10 +2279,10 @@ static int remove_dir_recurse(struct strbuf *path, int flag, int *kept_up) int ret = 0, original_len = path->len, len, kept_down = 0; int only_empty = (flag & REMOVE_DIR_EMPTY_ONLY); int keep_toplevel = (flag & REMOVE_DIR_KEEP_TOPLEVEL); - unsigned char submodule_head[20]; + struct object_id submodule_head; if ((flag & REMOVE_DIR_KEEP_NESTED_GIT) && - !resolve_gitlink_ref(path->buf, "HEAD", submodule_head)) { + !resolve_gitlink_ref(path->buf, "HEAD", &submodule_head)) { /* Do not descend and nuke a nested git work tree. */ if (kept_up) *kept_up = 1; |