Fix up default abbrev in setup_revisions() argument parser.

The default abbreviation precision should be DEFAULT_ABBREV as before.

Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/diff-tree.c b/diff-tree.c
index 54157e40dd8b2a3596f73284ffe0a1511f6c0952..979f792b6758101cb490f36ba3acff5d7d4b4473 100644 (file)
--- a/diff-tree.c
+++ b/diff-tree.c
@@ -69,6 +69,7 @@ int main(int argc, const char **argv)
 
        git_config(git_diff_config);
        nr_sha1 = 0;
+       opt->abbrev = 0;
        argc = setup_revisions(argc, argv, opt, NULL);
 
        while (--argc > 0) {

diff --git a/git.c b/git.c
index 437e9b57d0918175bf1e6d9ce7d500ace1e892b2..9d885569d8451d73a4aaf01fefa994b31041efee 100644 (file)
--- a/git.c
+++ b/git.c
@@ -286,6 +286,7 @@ static int cmd_log(int argc, const char **argv, char **envp)
        const char *commit_prefix = "commit ";
        int shown = 0;
 
+       rev.abbrev = DEFAULT_ABBREV;
        argc = setup_revisions(argc, argv, &rev, "HEAD");
        if (argc > 1)
                die("unrecognized argument: %s", argv[1]);

diff --git a/revision.c b/revision.c
index 1d26e0d911a884ab20eea29f801b7fbf69b017eb..bdf8005aec6428f274ad02af04366aaa5339bb18 100644 (file)
--- a/revision.c
+++ b/revision.c
@@ -475,7 +475,12 @@ 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->ignore_merges = 1;
        revs->pruning.recursive = 1;
        revs->pruning.add_remove = file_add_remove;
        revs->pruning.change = file_change;