submodule deinit: unset core.worktree

diff --git a/ref-filter.c b/ref-filter.c
index 39e2744c949bb7c4ffbcb7c7e08d3757a6b732de..01c1a82075eca737c2e3749e295ca24bbab870b6 100644 (file)
--- a/ref-filter.c
+++ b/ref-filter.c
@@ -824,7 +824,7 @@ static int grab_objectname(const char *name, const struct object_id *oid,
                        v->s = xstrdup(find_unique_abbrev(oid, atom->u.objectname.length));
                        return 1;
                } else
-                       die("BUG: unknown %%(objectname) option");
+                       BUG("unknown %%(objectname) option");
        }
        return 0;
 }
@@ -888,7 +888,7 @@ static void grab_commit_values(struct atom_value *val, int deref, struct object
                if (deref)
                        name++;
                if (!strcmp(name, "tree")) {
-                       v->s = xstrdup(oid_to_hex(&commit->tree->object.oid));
+                       v->s = xstrdup(oid_to_hex(get_commit_tree_oid(commit)));
                }
                else if (!strcmp(name, "numparent")) {
                        v->value = commit_list_count(commit->parents);
@@ -1372,7 +1372,7 @@ static void fill_remote_ref_details(struct used_atom *atom, const char *refname,
                else
                        *s = "";
        } else
-               die("BUG: unhandled RR_* enum");
+               BUG("unhandled RR_* enum");
 }
 
 char *get_head_description(void)