Merge branch 'js/difftool-builtin'

diff --git a/builtin/update-ref.c b/builtin/update-ref.c
index 04dd00f734166acc9c0670de061c4612877a7187..0b2ecf41aeda427e75eb7fe36388e7d0d91d5413 100644 (file)
--- a/builtin/update-ref.c
+++ b/builtin/update-ref.c
@@ -365,7 +365,7 @@ int cmd_update_ref(int argc, const char **argv, const char *prefix)
                                        N_("update <refname> not the one it points to")),
                OPT_BOOL('z', NULL, &end_null, N_("stdin has NUL-terminated arguments")),
                OPT_BOOL( 0 , "stdin", &read_stdin, N_("read updates from stdin")),
-               OPT_BOOL( 0 , "create-reflog", &create_reflog, N_("create_reflog")),
+               OPT_BOOL( 0 , "create-reflog", &create_reflog, N_("create a reflog")),
                OPT_END(),
        };
 
@@ -433,7 +433,7 @@ int cmd_update_ref(int argc, const char **argv, const char *prefix)
                 * For purposes of backwards compatibility, we treat
                 * NULL_SHA1 as "don't care" here:
                 */
-               return delete_ref(refname,
+               return delete_ref(msg, refname,
                                  (oldval && !is_null_sha1(oldsha1)) ? oldsha1 : NULL,
                                  flags);
        else