list-objects: pass full pathname to callbacks

diff --git a/builtin/worktree.c b/builtin/worktree.c
index 78d26902a6f1388a4cdd7d127a2a0c6359a00d19..475b9581a5583166c43199f1662b510842c59c7d 100644 (file)
--- a/builtin/worktree.c
+++ b/builtin/worktree.c
@@ -12,7 +12,7 @@
 #include "worktree.h"
 
 static const char * const worktree_usage[] = {
-       N_("git worktree add [<options>] <path> <branch>"),
+       N_("git worktree add [<options>] <path> [<branch>]"),
        N_("git worktree prune [<options>]"),
        N_("git worktree list [<options>]"),
        NULL
@@ -277,7 +277,7 @@ static int add_worktree(const char *path, const char *refname,
 
        if (commit)
                argv_array_pushl(&cp.args, "update-ref", "HEAD",
-                                sha1_to_hex(commit->object.sha1), NULL);
+                                oid_to_hex(&commit->object.oid), NULL);
        else
                argv_array_pushl(&cp.args, "symbolic-ref", "HEAD",
                                 symref.buf, NULL);