summaryrefslogtreecommitdiff
path: root/tree-walk.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-02-07 06:05:21 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-02-07 06:05:21 (GMT)
commitcfd9167c15e7b09f3964204964a4c158108c6403 (patch)
tree678a4051a44c8931ea469123528679e9987d0689 /tree-walk.c
parenta3d41733f9dd0d638d1538b54d516fed033c165b (diff)
parentdf799f5d99ac51d4fc791d546de3f936088582fc (diff)
downloadgit-cfd9167c15e7b09f3964204964a4c158108c6403.zip
git-cfd9167c15e7b09f3964204964a4c158108c6403.tar.gz
git-cfd9167c15e7b09f3964204964a4c158108c6403.tar.bz2
Merge branch 'dt/cat-file-batch-ambiguous'
"git cat-file --batch" reported a dangling symbolic link by mistake, when it wanted to report that a given name is ambiguous. * dt/cat-file-batch-ambiguous: t1512: test ambiguous cat-file --batch and --batch-output Do not print 'dangling' for cat-file in case of ambiguity
Diffstat (limited to 'tree-walk.c')
-rw-r--r--tree-walk.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/tree-walk.c b/tree-walk.c
index 277e3b3..1e4bbc8 100644
--- a/tree-walk.c
+++ b/tree-walk.c
@@ -582,10 +582,10 @@ int get_tree_entry(const struct object_id *tree_oid, const char *name, struct ob
* with the sha1 of the found object, and *mode will hold the mode of
* the object.
*
- * See the code for enum follow_symlink_result for a description of
+ * See the code for enum get_oid_result for a description of
* the return values.
*/
-enum follow_symlinks_result get_tree_entry_follow_symlinks(struct object_id *tree_oid, const char *name, struct object_id *result, struct strbuf *result_path, unsigned *mode)
+enum get_oid_result get_tree_entry_follow_symlinks(struct object_id *tree_oid, const char *name, struct object_id *result, struct strbuf *result_path, unsigned *mode)
{
int retval = MISSING_OBJECT;
struct dir_state *parents = NULL;