Merge branch 'jd/p4-jobs-in-commit'

diff --git a/builtin/checkout.c b/builtin/checkout.c
index cfa66e25eb0838ba70d87d3008c6d3c57e363bd1..ea2fe1cf3fc251dcab2f2d70e737a0f8f5000a21 100644 (file)
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -242,7 +242,6 @@ static int checkout_paths(const struct checkout_opts *opts,
        struct checkout state;
        static char *ps_matched;
        unsigned char rev[20];
-       int flag;
        struct commit *head;
        int errs = 0;
        struct lock_file *lock_file;
@@ -375,7 +374,7 @@ static int checkout_paths(const struct checkout_opts *opts,
        if (write_locked_index(&the_index, lock_file, COMMIT_LOCK))
                die(_("unable to write new index file"));
 
-       read_ref_full("HEAD", 0, rev, &flag);
+       read_ref_full("HEAD", 0, rev, NULL);
        head = lookup_commit_reference_gently(rev, 1);
 
        errs |= post_checkout_hook(head, head, 0);
@@ -662,7 +661,7 @@ static void update_refs_for_switch(const struct checkout_opts *opts,
                }
        } else if (new->path) { /* Switch branches. */
                if (create_symref("HEAD", new->path, msg.buf) < 0)
-                       die("unable to update HEAD");
+                       die(_("unable to update HEAD"));
                if (!opts->quiet) {
                        if (old->path && !strcmp(new->path, old->path)) {
                                if (opts->new_branch_force)