Skip to content

Commit

Permalink
Split init_revisions() out of setup_revisions()
Browse files Browse the repository at this point in the history
Merging all three option parsers related to whatchanged is
unarguably the right thing, but the fallout was too big to scare
me away.  Let's try it once again, but once step at time.

This splits out init_revisions() call from setup_revisions(), so
that the callers can set different defaults to match the
traditional benaviour.

The rev-list command is still broken in a big way, which is the
topic of next step.

Signed-off-by: Junio C Hamano <junkio@cox.net>
  • Loading branch information
Junio C Hamano committed Apr 16, 2006
1 parent 8c1f0b4 commit 6b9c58f
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 5 deletions.
2 changes: 2 additions & 0 deletions commit.h
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ enum cmit_fmt {
CMIT_FMT_FULL,
CMIT_FMT_FULLER,
CMIT_FMT_ONELINE,

CMIT_FMT_UNSPECIFIED,
};

extern enum cmit_fmt get_commit_format(const char *arg);
Expand Down
1 change: 1 addition & 0 deletions diff-tree.c
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ int main(int argc, const char **argv)

git_config(git_diff_config);
nr_sha1 = 0;
init_revisions(opt);
opt->abbrev = 0;
argc = setup_revisions(argc, argv, opt, NULL);

Expand Down
1 change: 1 addition & 0 deletions git.c
Original file line number Diff line number Diff line change
Expand Up @@ -286,6 +286,7 @@ static int cmd_log(int argc, const char **argv, char **envp)
const char *commit_prefix = "commit ";
int shown = 0;

init_revisions(&rev);
rev.abbrev = DEFAULT_ABBREV;
argc = setup_revisions(argc, argv, &rev, "HEAD");
if (argc > 1)
Expand Down
1 change: 1 addition & 0 deletions http-push.c
Original file line number Diff line number Diff line change
Expand Up @@ -2498,6 +2498,7 @@ int main(int argc, char **argv)
commit_argv[3] = old_sha1_hex;
commit_argc++;
}
init_revisions(&revs);
setup_revisions(commit_argc, commit_argv, &revs, NULL);
free(new_sha1_hex);
if (old_sha1_hex) {
Expand Down
6 changes: 1 addition & 5 deletions revision.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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++) {
Expand Down

0 comments on commit 6b9c58f

Please sign in to comment.