diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-05-30 05:04:10 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-05-30 05:04:10 (GMT) |
| commit | 42c8ce1c49f862c98b35e4d89c88aa3d489d6608 (patch) | |
| tree | dce3eb119c51e3d539f5a703411787d3a333b175 /sha1-name.c | |
| parent | 3d241297991c6f6ac6b1e50e52a4ae35bc431f28 (diff) | |
| parent | 7882fa220c1f86e3f9707270e2e94d54149394ed (diff) | |
| download | git-42c8ce1c49f862c98b35e4d89c88aa3d489d6608.zip git-42c8ce1c49f862c98b35e4d89c88aa3d489d6608.tar.gz git-42c8ce1c49f862c98b35e4d89c88aa3d489d6608.tar.bz2 | |
Merge branch 'bc/object-id'
Conversion from uchar[20] to struct object_id continues.
* bc/object-id: (42 commits)
merge-one-file: compute empty blob object ID
add--interactive: compute the empty tree value
Update shell scripts to compute empty tree object ID
sha1_file: only expose empty object constants through git_hash_algo
dir: use the_hash_algo for empty blob object ID
sequencer: use the_hash_algo for empty tree object ID
cache-tree: use is_empty_tree_oid
sha1_file: convert cached object code to struct object_id
builtin/reset: convert use of EMPTY_TREE_SHA1_BIN
builtin/receive-pack: convert one use of EMPTY_TREE_SHA1_HEX
wt-status: convert two uses of EMPTY_TREE_SHA1_HEX
submodule: convert several uses of EMPTY_TREE_SHA1_HEX
sequencer: convert one use of EMPTY_TREE_SHA1_HEX
merge: convert empty tree constant to the_hash_algo
builtin/merge: switch tree functions to use object_id
builtin/am: convert uses of EMPTY_TREE_SHA1_BIN to the_hash_algo
sha1-file: add functions for hex empty tree and blob OIDs
builtin/receive-pack: avoid hard-coded constants for push certs
diff: specify abbreviation size in terms of the_hash_algo
upload-pack: replace use of several hard-coded constants
...
Diffstat (limited to 'sha1-name.c')
| -rw-r--r-- | sha1-name.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sha1-name.c b/sha1-name.c index 60b8a93..cc0028e 100644 --- a/sha1-name.c +++ b/sha1-name.c @@ -1685,8 +1685,8 @@ static int get_oid_with_context_1(const char *name, if (new_filename) filename = new_filename; if (flags & GET_OID_FOLLOW_SYMLINKS) { - ret = get_tree_entry_follow_symlinks(tree_oid.hash, - filename, oid->hash, &oc->symlink_path, + ret = get_tree_entry_follow_symlinks(&tree_oid, + filename, oid, &oc->symlink_path, &oc->mode); } else { ret = get_tree_entry(&tree_oid, filename, oid, @@ -1698,7 +1698,6 @@ static int get_oid_with_context_1(const char *name, name, len); } } - hashcpy(oc->tree, tree_oid.hash); if (flags & GET_OID_RECORD_PATH) oc->path = xstrdup(filename); |