Merge branch 'mg/work-tree-tests' into maint

diff --git a/builtin/reset.c b/builtin/reset.c
index d0014b625843b20cc3f7db827e326367e3e49a81..092c3a5399c731e83058233f8e3e459be493e140 100644 (file)
--- a/builtin/reset.c
+++ b/builtin/reset.c
@@ -96,7 +96,7 @@ static void print_new_head_line(struct commit *commit)
        const char *hex, *body;
        const char *msg;
 
-       hex = find_unique_abbrev(get_object_hash(commit->object), DEFAULT_ABBREV);
+       hex = find_unique_abbrev(commit->object.oid.hash, DEFAULT_ABBREV);
        printf(_("HEAD is now at %s"), hex);
        msg = logmsg_reencode(commit, NULL, get_log_output_encoding());
        body = strstr(msg, "\n\n");