apply --ignore-space-change: lines with and without leading whitespaces do not match

diff --git a/builtin/revert.c b/builtin/revert.c
index 52c35e75d90dc07f6a80362f200212e314a14ec8..87659c9fdb749bf8cbf33ce71391fdfe284edd6d 100644 (file)
--- a/builtin/revert.c
+++ b/builtin/revert.c
@@ -168,6 +168,8 @@ static void parse_args(int argc, const char **argv, struct replay_opts *opts)
                opts->revs->no_walk = REVISION_WALK_NO_WALK_UNSORTED;
                if (argc < 2)
                        usage_with_options(usage_str, options);
+               if (!strcmp(argv[1], "-"))
+                       argv[1] = "@{-1}";
                memset(&s_r_opt, 0, sizeof(s_r_opt));
                s_r_opt.assume_dashdash = 1;
                argc = setup_revisions(argc, argv, opts->revs, &s_r_opt);
@@ -202,8 +204,6 @@ 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)