notes: convert internal parts to struct object_id

diff --git a/builtin/checkout.c b/builtin/checkout.c
index b6249a3a39eea52587c1515a1c54b4263e630a83..a6b2af39d3e881480193a38ff1ca3b65cdc55d94 100644 (file)
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -1289,9 +1289,8 @@ int cmd_checkout(int argc, const char **argv, const char *prefix)
                 * new_branch && argc > 1 will be caught later.
                 */
                if (opts.new_branch && argc == 1)
-                       die(_("Cannot update paths and switch to branch '%s' at the same time.\n"
-                             "Did you intend to checkout '%s' which can not be resolved as commit?"),
-                           opts.new_branch, argv[0]);
+                       die(_("'%s' is not a commit and a branch '%s' cannot be created from it"),
+                               argv[0], opts.new_branch);
 
                if (opts.force_detach)
                        die(_("git checkout: --detach does not take a path argument '%s'"),