Merge branch 'jk/shortlog-tolerate-broken-commit'

diff --git a/builtin/revert.c b/builtin/revert.c
index 8e87acd12e622957df6bc0a93903898361149f91..52c35e75d90dc07f6a80362f200212e314a14ec8 100644 (file)
--- a/builtin/revert.c
+++ b/builtin/revert.c
@@ -202,6 +202,8 @@ int cmd_cherry_pick(int argc, const char **argv, const char *prefix)
        memset(&opts, 0, sizeof(opts));
        opts.action = REPLAY_PICK;
        git_config(git_default_config, NULL);
+       if (!strcmp(argv[1], "-"))
+               argv[1] = "@{-1}";
        parse_args(argc, argv, &opts);
        res = sequencer_pick_revisions(&opts);
        if (res < 0)