summaryrefslogtreecommitdiff
path: root/builtin/merge.c
diff options
context:
space:
mode:
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>2018-09-21 15:57:38 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-09-21 16:51:19 (GMT)
commit2abf3503854e27e18b2fb5ba97ceeb3f79240ee5 (patch)
tree32420041df8dc531f41f954438910fd308cdd5ff /builtin/merge.c
parent26d024ecf0e2e5bd697714b95930bb6008d85f3f (diff)
downloadgit-2abf3503854e27e18b2fb5ba97ceeb3f79240ee5.zip
git-2abf3503854e27e18b2fb5ba97ceeb3f79240ee5.tar.gz
git-2abf3503854e27e18b2fb5ba97ceeb3f79240ee5.tar.bz2
revision.c: remove implicit dependency on the_index
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge.c')
-rw-r--r--builtin/merge.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/merge.c b/builtin/merge.c
index 3c003ce..a493f8d 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -389,7 +389,7 @@ static void squash_message(struct commit *commit, struct commit_list *remotehead
printf(_("Squash commit -- not updating HEAD\n"));
- init_revisions(&rev, NULL);
+ repo_init_revisions(the_repository, &rev, NULL);
rev.ignore_merges = 1;
rev.commit_format = CMIT_FMT_MEDIUM;
@@ -911,7 +911,7 @@ static int evaluate_result(void)
struct rev_info rev;
/* Check how many files differ. */
- init_revisions(&rev, "");
+ repo_init_revisions(the_repository, &rev, "");
setup_revisions(0, NULL, &rev, NULL);
rev.diffopt.output_format |=
DIFF_FORMAT_CALLBACK;