reftable: fix resource leak in block.c error path

[thirdparty/git.git] / revision.c

diff --git a/revision.c b/revision.c
index ab7c1358042fa18a996c66505eb6694b950c18fa..1981a0859f0e24cadec5e496e9616dc39f23330c 100644 (file)
--- a/revision.c
+++ b/revision.c
@@ -2254,10 +2254,6 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg
        } else if (!strcmp(arg, "--author-date-order")) {
                revs->sort_order = REV_SORT_BY_AUTHOR_DATE;
                revs->topo_order = 1;
-       } else if (!strcmp(arg, "--unsorted-input")) {
-               if (revs->no_walk)
-                       die(_("--unsorted-input is incompatible with --no-walk"));
-               revs->unsorted_input = 1;
        } else if (!strcmp(arg, "--early-output")) {
                revs->early_output = 100;
                revs->topo_order = 1;
@@ -2651,13 +2647,8 @@ static int handle_revision_pseudo_opt(struct rev_info *revs,
        } else if (!strcmp(arg, "--not")) {
                *flags ^= UNINTERESTING | BOTTOM;
        } else if (!strcmp(arg, "--no-walk")) {
-               if (!revs->no_walk && revs->unsorted_input)
-                       die(_("--no-walk is incompatible with --unsorted-input"));
                revs->no_walk = 1;
        } else if (skip_prefix(arg, "--no-walk=", &optarg)) {
-               if (!revs->no_walk && revs->unsorted_input)
-                       die(_("--no-walk is incompatible with --unsorted-input"));
-
                /*
                 * Detached form ("--no-walk X" as opposed to "--no-walk=X")
                 * not allowed, since the argument is optional.