Split init_revisions() out of setup_revisions()

[git.git] / revision.c

diff --git a/revision.c b/revision.c
index bdf8005..9693b6e 100644 (file)
--- a/revision.c
+++ b/revision.c
@@ -475,11 +475,9 @@ static void handle_all(struct rev_info *revs, unsigned flags)
 
 void init_revisions(struct rev_info *revs)
 {
-       unsigned abbrev = revs->abbrev;
-
        memset(revs, 0, sizeof(*revs));
 
-       revs->abbrev = abbrev;
+       revs->abbrev = DEFAULT_ABBREV;
        revs->ignore_merges = 1;
        revs->pruning.recursive = 1;
        revs->pruning.add_remove = file_add_remove;
@@ -516,8 +514,6 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch
        const char **unrecognized = argv + 1;
        int left = 1;
 
-       init_revisions(revs);
-
        /* First, search for "--" */
        seen_dashdash = 0;
        for (i = 1; i < argc; i++) {