Merge branch 'ah/doc-filter-branch-export-env' into maint

diff --git a/builtin/rev-parse.c b/builtin/rev-parse.c
index f54d7b5028a455eae9b133e72ac24333c5035f2e..051333091062ef8e2e717ec4aef8a9bdf3b4450f 100644 (file)
--- a/builtin/rev-parse.c
+++ b/builtin/rev-parse.c
@@ -205,9 +205,9 @@ static int anti_reference(const char *refname, const struct object_id *oid, int
        return 0;
 }
 
-static int show_abbrev(const unsigned char *sha1, void *cb_data)
+static int show_abbrev(const struct object_id *oid, void *cb_data)
 {
-       show_rev(NORMAL, sha1, NULL);
+       show_rev(NORMAL, oid->hash, NULL);
        return 0;
 }