Merge branch 'rs/maint-archive-match-pathspec' into maint

diff --git a/revision.c b/revision.c
index 0de78fbad6008b72aba946df0dfd03d5183f42bf..34f9ab98d1872770ef4d54014c31ece6eb7c8c39 100644 (file)
--- a/revision.c
+++ b/revision.c
@@ -1176,6 +1176,7 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg
        } else if (!strcmp(arg, "--oneline")) {
                revs->verbose_header = 1;
                get_commit_format("oneline", revs);
+               revs->pretty_given = 1;
                revs->abbrev_commit = 1;
        } else if (!strcmp(arg, "--graph")) {
                revs->topo_order = 1;