Merge branch 'jk/merge-file-exit-code'

diff --git a/builtin/show-branch.c b/builtin/show-branch.c
index 5cc6ad19b9f72d5279d7230322e9cbe74f99da06..ac5141df80dffaf7adc42f76989698a5a90cb677 100644 (file)
--- a/builtin/show-branch.c
+++ b/builtin/show-branch.c
@@ -732,6 +732,8 @@ int cmd_show_branch(int ac, const char **av, const char *prefix)
                        fake_av[1] = NULL;
                        av = fake_av;
                        ac = 1;
+                       if (!*av)
+                               die("no branches given, and HEAD is not valid");
                }
                if (ac != 1)
                        die("--reflog option needs one branch name");
@@ -773,7 +775,8 @@ int cmd_show_branch(int ac, const char **av, const char *prefix)
                        else
                                msg++;
                        reflog_msg[i] = xstrfmt("(%s) %s",
-                                               show_date(timestamp, tz, 1),
+                                               show_date(timestamp, tz,
+                                                         DATE_MODE(RELATIVE)),
                                                msg);
                        free(logmsg);