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 54157e4..979f792b 100644
--- a/diff-tree.c
+++ b/diff-tree.c
@@ -69,6 +69,7 @@
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 437e9b5..9d88556 100644
--- a/git.c
+++ b/git.c
@@ -286,6 +286,7 @@
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 1d26e0d..bdf8005 100644
--- a/revision.c
+++ b/revision.c
@@ -475,7 +475,12 @@
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;
