Merge branch 'pw/rebase-i-internal'

diff --git a/builtin/rev-list.c b/builtin/rev-list.c
index 425a5774db0697774df499fc16a626ab1e1efcf9..9f31837d303f1f302266fdd03298ddce73867ba0 100644 (file)
--- a/builtin/rev-list.c
+++ b/builtin/rev-list.c
@@ -379,7 +379,6 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix)
        repo_init_revisions(the_repository, &revs, prefix);
        revs.abbrev = DEFAULT_ABBREV;
        revs.commit_format = CMIT_FMT_UNSPECIFIED;
-       revs.do_not_die_on_missing_tree = 1;
 
        /*
         * Scan the argument list before invoking setup_revisions(), so that we
@@ -409,6 +408,9 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix)
                }
        }
 
+       if (arg_missing_action)
+               revs.do_not_die_on_missing_tree = 1;
+
        argc = setup_revisions(argc, argv, &revs, &s_r_opt);
 
        memset(&info, 0, sizeof(info));