sequencer.c: remove implicit dependency on the_index

pclouds · gitster · commit f11c95805495 · 2018-11-12T14:50:05.000+09:00
Since we're going to pass 'struct repository *' around most of the
time instead of 'struct index_state *' because most sequencer.c
operations need more than just the index, the_repository is replaced
as well in the functions that now take 'struct repository
*'. the_repository is still present in this file, but total clean up
will be done later. It's not the main focus of this patch.

Signed-off-by: Nguyễn Thái Ngọc Duy &lt;pclouds@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/builtin/commit.c b/builtin/commit.c
@@ -1679,7 +1679,8 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
 			flags |= SUMMARY_INITIAL_COMMIT;
 		if (author_date_is_interesting())
 			flags |= SUMMARY_SHOW_AUTHOR_DATE;
-		print_commit_summary(prefix, &oid, flags);
+		print_commit_summary(the_repository, prefix,
+				     &oid, flags);
 	}
 
 	UNLEAK(err);
diff --git a/builtin/merge.c b/builtin/merge.c
@@ -896,7 +896,7 @@ static int suggest_conflicts(void)
 	filename = git_path_merge_msg(the_repository);
 	fp = xfopen(filename, "a");
 
-	append_conflicts_hint(&msgbuf);
+	append_conflicts_hint(&the_index, &msgbuf);
 	fputs(msgbuf.buf, fp);
 	strbuf_release(&msgbuf);
 	fclose(fp);
diff --git a/builtin/rebase--interactive.c b/builtin/rebase--interactive.c
@@ -105,7 +105,7 @@ static int do_interactive_rebase(struct replay_opts *opts, unsigned flags,
 	if (restrict_revision)
 		argv_array_push(&make_script_args, restrict_revision);
 
-	ret = sequencer_make_script(todo_list,
+	ret = sequencer_make_script(the_repository, todo_list,
 				    make_script_args.argc, make_script_args.argv,
 				    flags);
 	fclose(todo_list);
@@ -235,7 +235,7 @@ int cmd_rebase__interactive(int argc, const char **argv, const char *prefix)
 		rerere_clear(&merge_rr);
 		/* fallthrough */
 	case CONTINUE:
-		ret = sequencer_continue(&opts);
+		ret = sequencer_continue(the_repository, &opts);
 		break;
 	}
 	case EDIT_TODO:
diff --git a/builtin/revert.c b/builtin/revert.c
@@ -199,10 +199,10 @@ static int run_sequencer(int argc, const char **argv, struct replay_opts *opts)
 		return ret;
 	}
 	if (cmd == 'c')
-		return sequencer_continue(opts);
+		return sequencer_continue(the_repository, opts);
 	if (cmd == 'a')
 		return sequencer_rollback(opts);
-	return sequencer_pick_revisions(opts);
+	return sequencer_pick_revisions(the_repository, opts);
 }
 
 int cmd_revert(int argc, const char **argv, const char *prefix)
diff --git a/sequencer.c b/sequencer.c
diff --git a/sequencer.h b/sequencer.h

Original file line number	Diff line number	Diff line change
`@@ -1679,7 +1679,8 @@ int cmd_commit(int argc, const char *argv, const char prefix)`
`1679`	`1679`	`flags \|= SUMMARY_INITIAL_COMMIT;`
`1680`	`1680`	`if (author_date_is_interesting())`
`1681`	`1681`	`flags \|= SUMMARY_SHOW_AUTHOR_DATE;`
`1682`		`- print_commit_summary(prefix, &oid, flags);`
	`1682`	`+ print_commit_summary(the_repository, prefix,`
	`1683`	`+ &oid, flags);`
`1683`	`1684`	`}`
`1684`	`1685`
`1685`	`1686`	`UNLEAK(err);`
Original file line number	Diff line number	Diff line change
`@@ -199,10 +199,10 @@ static int run_sequencer(int argc, const char *argv, struct replay_opts opts)`
`199`	`199`	`return ret;`
`200`	`200`	`}`
`201`	`201`	`if (cmd == 'c')`
`202`		`- return sequencer_continue(opts);`
	`202`	`+ return sequencer_continue(the_repository, opts);`
`203`	`203`	`if (cmd == 'a')`
`204`	`204`	`return sequencer_rollback(opts);`
`205`		`- return sequencer_pick_revisions(opts);`
	`205`	`+ return sequencer_pick_revisions(the_repository, opts);`
`206`	`206`	`}`
`207`	`207`
`208`	`208`	`int cmd_revert(int argc, const char *argv, const char prefix)`