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>
Junio C Hamano committed
Apr 14, 2006 at 22:19 UTC
8e8f998739db6526fe890fabc88c866759bc2ac3
3 files changed
+7
diff-tree.c
+1
@@ -69,6 +69,7 @@ int main(int argc, const char **argv)
69
70
git_config(git_diff_config);
71
nr_sha1 = 0;
72
+ opt->abbrev = 0;
73
argc = setup_revisions(argc, argv, opt, NULL);
74
75
while (--argc > 0) {
git.c
+1
@@ -286,6 +286,7 @@ static int cmd_log(int argc, const char **argv, char **envp)
286
const char *commit_prefix = "commit ";
287
int shown = 0;
288
289
+ rev.abbrev = DEFAULT_ABBREV;
290
argc = setup_revisions(argc, argv, &rev, "HEAD");
291
if (argc > 1)
292
die("unrecognized argument: %s", argv[1]);
revision.c
+5
@@ -475,7 +475,12 @@ static void handle_all(struct rev_info *revs, unsigned flags)
475
476
void init_revisions(struct rev_info *revs)
477
{
478
+ unsigned abbrev = revs->abbrev;
479
+
480
memset(revs, 0, sizeof(*revs));
481
+
482
+ revs->abbrev = abbrev;
483
+ revs->ignore_merges = 1;
484
revs->pruning.recursive = 1;
485
revs->pruning.add_remove = file_add_remove;
486
revs->pruning.change = file_change;